diff --git a/admin.mss b/admin.mss index c474017..e7acaca 100644 --- a/admin.mss +++ b/admin.mss @@ -30,7 +30,7 @@ [zoom>=4] { line-width: 1; } - [zoom>=10] { + [zoom>=9] { line-width: 2; } } @@ -55,7 +55,7 @@ line-dasharray: 5,5,2,5; } } - [zoom>=12] { + [zoom>=9] { line-color: darken(@admin_3, 20); } } diff --git a/data/city.csv b/data/city.csv index 6ed2ee2..8c4eb97 100644 --- a/data/city.csv +++ b/data/city.csv @@ -26,8 +26,8 @@ Wien,Vienne,Vienna,فيينا,ambassade,1,48.2083537,16.3725042,AT,yes,W, Bakı,Bakou,Baku,باكو,ambassade,1,40.3754434,49.8326748,AZ,yes,, المنامة,Manama,Manama,المنامة,ambassade,1,26.2235041,50.5822436,BH,yes,, ঢাকা,Dacca,Dhaka,دكا,ambassade,1,23.7593572,90.3788136,BD,yes,, -Bruxelles - Brussel,Bruxelles,Brussels,بروكسل,ambassade,1,50.8465573,4.351697,BE,yes,, -Cotonou,Cotonou,Cotonou,كوتونو,ambassade,1,6.367682,2.4252292,BJ,no,, +Bruxelles - Brussel,Bruxelles,Brussels,بروكسل,ambassade,1,50.8465573,4.351697,BE,yes,N, +Cotonou,Cotonou,Cotonou,كوتونو,ambassade,1,6.367682,2.4252292,BJ,no,S, Минск,Minsk,Minsk,مينسك,ambassade,1,53.902334,27.5618791,BY,yes,, ရန်ကုန်,Rangoun,Yangon,يانغون,ambassade,1,16.7967129,96.1609916,MM,no,, La Paz,La Paz,La Paz,لاباز,ambassade,1,-16.4956371,-68.1336346,BO,no,, @@ -81,7 +81,7 @@ Quito,Quito,Quito,كيتو,ambassade,1,-0.2201641,-78.5123274,EC,yes,, Madrid,Madrid,Madrid,مدريد,ambassade,1,40.4167047,-3.7035825,ES,yes,, Barcelona,Barcelone,Barcelona,برشلونة,consulat_general,4,41.3828939,2.1774322,ES,no,, Bilbao,Bilbao,Bilbao,بلباو,consulat_general,4,43.2629489,-2.9349459,ES,no,, -Sevilla,Séville,Seville,اشبيلية,consulat_general,4,37.3886303,-5.9953171,ES,no,, +Sevilla,Séville,Seville,اشبيلية,consulat_general,4,37.3886303,-5.9953171,ES,no,N, Tallinn,Tallinn,Tallinn,تالين,ambassade,1,59.4372155,24.7453688,EE,yes,, Washington,Washington,Washington D.C.,واشنطن,ambassade,1,38.8949549,-77.0366456,US,yes,NW, New York,New York,New York,نيويورك,rp,2,40.7306458,-73.9866136,US,no,NW, @@ -145,7 +145,7 @@ Monrovia,Monrovia,Monrovia,مونروفيا,ambassade,1,6.31055665987,-10.804751 طرابلس,Tripoli,Tripoli,طرابلس,ambassade,1,32.896672,13.1777923,LY,yes,, Vaduz,Vaduz,Vaduz,فادوتس,ambassade,1,47.1362,9.5358,LI,yes,, Vilnius,Vilnius,Vilnius,فيلنيوس,ambassade,1,54.6870458,25.2829111,LT,yes,NW, -Luxembourg,Luxembourg,Luxembourg,لوكسمبورغ,ambassade,1,49.6112768,6.129799,LU,yes,, +Luxembourg,Luxembourg,Luxembourg,لوكسمبورغ,ambassade,1,49.6112768,6.129799,LU,yes,N, Скопје,Skopje,Skopje,سكوبيه,ambassade,1,41.9960924,21.4316495,MK,yes,, Antananarivo,Tananarive,Antananarivo,أنتاناناريفو,ambassade,1,-18.9100122,47.5255809,MG,yes,N, Kuala Lumpur,Kuala lumpur,Kuala Lumpur,كوالالمبور,ambassade,1,3.1546872,101.7136362,MY,yes,, diff --git a/data/country.csv b/data/country.csv index 95f0da1..7b9fd0a 100644 --- a/data/country.csv +++ b/data/country.csv @@ -1,46 +1,46 @@ name,name:fr,short_name:fr,name:en,name:ar,prio,type,latitude,longitude,iso,sov The Bahamas,Les Bahamas,,The Bahamas,جزر باهاماس,99,99-Other,24.0897198,-76.5739731,BS, Dominica,Dominique,,Dominica,دومينيكا,99,99-Other,15.3973214,-61.359954,DM, -South Georgia and South Sandwich Islands,Géorgie du Sud-et-les Îles Sandwich du Sud,,South Georgia and the South Sandwich Islands,جورجيا الجنوبية وجزر ساندويتش الجنوبية,99,99-Other,-56.5685843,-33.9908678,GS,RU -Montserrat,Montserrat,,Montserrat,مونتسرات,99,99-Other,16.7451489,-62.1930244,MS,RU +South Georgia and South Sandwich Islands,Géorgie du Sud-et-les Îles Sandwich du Sud,,South Georgia and the South Sandwich Islands,جورجيا الجنوبية وجزر ساندويتش الجنوبية,99,99-Other,-56.5685843,-33.9908678,GS,UK +Montserrat,Montserrat,,Montserrat,مونتسرات,99,99-Other,16.7451489,-62.1930244,MS,UK Føroyar,Îles Féroé,,Faroe Islands,جزر فارو,99,99-Other,61.8678577,-6.9698548,FO,DK Lesotho,Lesotho,,Lesotho,ليسوتو,99,99-Other,-29.6239461,28.2335865,LS, Turks and Caicos Islands,Îles Turques-et-Caïques,,Turks and Caicos Islands,جزر توركس وكايكوس,99,99-Other,21.5592203,-71.7721318,TC, -Bermuda,Bermudes,,Bermuda,جزر برمودا,99,99-Other,32.3191672,-64.7671032,BM,RU +Bermuda,Bermudes,,Bermuda,جزر برمودا,99,99-Other,32.3191672,-64.7671032,BM,UK الأراضي الفلسطينية,Territoires Palestiniens,,Palestinian Territories,الأراضي الفلسطينية,99,99-Other,31.8861384,34.8212339,PS, Niuē,Niue,,Niue,نييوي,99,99-Other,-19.0541612,-169.8621129,NU,NZ Tonga,Tonga,,Tonga,تونجا,99,99-Other,-19.7345111,-176.4580757,TO, Saint Kitts and Nevis,Saint-Christophe-et-Niévès,,Saint Kitts and Nevis,سانت كيتس ونيفس,99,99-Other,17.2554073,-62.6907404,KN, -Cayman Islands,Îles Caïmans,,Cayman Islands,جزر الكايمان,99,99-Other,19.5097189,-80.5712351,KY,RU +Cayman Islands,Îles Caïmans,,Cayman Islands,جزر الكايمان,99,99-Other,19.5097189,-80.5712351,KY,UK Grenada,Grenade,,Grenada,غرينادا,99,99-Other,12.1913266,-61.5899005,GD, Belau,Palaos,,Palau,بالاو,99,99-Other,5.485,132.9200098,PW, Saint Vincent and the Grenadines,Saint-Vincent-et-les-Grenadines,,Saint Vincent and the Grenadines,سانت فنسنت وجزر غرينادين,99,99-Other,13.0498274,-61.2875808,VC, Kūki 'Āirani,Îles Cook,,Cook Islands,جزر كوك,99,99-Other,-15.4374746,-161.5972899,CK,NZ -Guernsey,Guernesey,,Guernsey,غيرنزي,99,99-Other,49.58122,-2.5356414,GG,RU +Guernsey,Guernesey,,Guernsey,غيرنزي,99,99-Other,49.58122,-2.5356414,GG,UK Tuvalu,Tuvalu,,Tuvalu,توفالو,99,99-Other,-8.5172,179.1448,TV, Gambia,Gambie,,Gambia,غامبيا,99,99-Other,13.4431569,-15.4133017,GM, Tokelau,Tokelau,,Tokelau,توكلو,99,99-Other,-8.9885565,-171.8505629,TK,NZ Naoero,Nauru,,Nauru,ناورو,99,99-Other,-0.528,166.9348582,NR, Micronesia,Micronésie,,Micronesia,مايكرونيزيا,99,99-Other,5.559,150.2299283,FM, -Jersey,Jersey,,Jersey,جيرزي,99,99-Other,49.1663334,-2.19625,JE,RU +Jersey,Jersey,,Jersey,جيرزي,99,99-Other,49.1663334,-2.19625,JE,UK Anguilla,Anguilla,,Anguilla,أنجويلا,99,99-Other,18.4283324,-63.175872,AI, Timór Lorosa'e,Timor oriental,,East Timor,تيمور الشرقية,99,99-Other,-8.8269117,125.7875547,TL, São Tomé e Príncipe,Sao Tomé-et-Principe,,Sao Tome and Principe,ساو تومي وبرينسيبي,99,99-Other,0.8561232,6.9655601,ST, -Isle of Man,Île de Man,,Isle of Man,جزيرة مان,99,99-Other,54.1992144,-4.5680673,IM,RU +Isle of Man,Île de Man,,Isle of Man,جزيرة مان,99,99-Other,54.1992144,-4.5680673,IM,UK Belize,Belize,,Belize,بليز,99,99-Other,17.1908648,-88.2680289,BZ, Antigua and Barbuda,Antigua-et-Barbuda,,Antigua and Barbuda,أنتيغوا وباربودا,99,99-Other,17.343195,-62.0007544,AG, -Gibraltar,Gibraltar,,Gibraltar,جبل طارق,99,99-Other,36.1068963,-5.3386582,GI,RU +Gibraltar,Gibraltar,,Gibraltar,جبل طارق,99,99-Other,36.1068963,-5.3386582,GI,UK འབྲུག་ཡུལ་,Bhoutan,,Bhutan,بوتان,99,99-Other,27.4745015,90.4358523,BT, Sāmoa,Samoa,,Samoa,ساموا,99,99-Other,-13.7576404,-172.1010547,WS, -British Virgin Islands,Îles Vierges britanniques,,British Virgin Islands,الجزر العذراء البريطانية,99,99-Other,18.5279556,-64.5078453,VG,RU +British Virgin Islands,Îles Vierges britanniques,,British Virgin Islands,الجزر العذراء البريطانية,99,99-Other,18.5279556,-64.5078453,VG,UK Solomon Islands,Salomon,,Solomon Islands,جزر سليمان,99,99-Other,-9.0266399,162.8577611,SB, -Pitcairn Islands,Îles Pitcairn,,Pitcairn Islands,جزر بيتكيرن,99,99-Other,-24.4981252,-127.7612601,PN,RU +Pitcairn Islands,Îles Pitcairn,,Pitcairn Islands,جزر بيتكيرن,99,99-Other,-24.4981252,-127.7612601,PN,UK M̧ajeļ,Îles Marshall,,Marshall Islands,جزر مارشال,99,99-Other,9.6235,166.4843173,MH, Kiribati,Kiribati,,Kiribati,كيريباتي,99,99-Other,0.44833,-171.66548,KI, -"Saint Helena, Ascension and Tristan da Cunha","Sainte-Hélène, Ascension et Tristan da Cunha",,"Saint Helena, Ascension and Tristan da Cunha",سانت هيلينا، أسينسيون وتريستان دا كونها,99,99-Other,-24.13,-10.0230549,SH,RU +"Saint Helena, Ascension and Tristan da Cunha","Sainte-Hélène, Ascension et Tristan da Cunha",,"Saint Helena, Ascension and Tristan da Cunha",سانت هيلينا، أسينسيون وتريستان دا كونها,99,99-Other,-24.13,-10.0230549,SH,UK Kalaallit Nunaat,Groenland,,Greenland,جرينلاند,99,99-Other,71.6952795,-42.0769588,GL,DK -British Indian Ocean Territory,Territoire britannique de l'Océan Indien,,British Indian Ocean Territory,إقليم المحيط الهندي البريطاني,99,99-Other,-6.3412369,71.8692598,IO,RU -Falkland Islands,Îles Falkland,,Falkland Islands,جزر الفولكلاند,99,99-Other,-51.9579887,-59.569457,FK,RU +British Indian Ocean Territory,Territoire britannique de l'Océan Indien,,British Indian Ocean Territory,إقليم المحيط الهندي البريطاني,99,99-Other,-6.3412369,71.8692598,IO,UK +Falkland Islands,Îles Falkland,,Falkland Islands,جزر الفولكلاند,99,99-Other,-51.9579887,-59.569457,FK,UK San Marino,Saint-Marin,,San Marino,سان مارينو,99,99-Other,43.9428966,12.4596955,SM, Liechtenstein,Liechtenstein,,Liechtenstein,ليختنشتين,6,6-Résidence,47.1416307,9.5531527,LI, Swaziland,Swaziland,,Swaziland,سوازيلند,6,6-Résidence,-26.5624806,31.3991317,SZ, @@ -133,7 +133,7 @@ Kosova,Kosovo,,Kosovo,كوسوفو,3,3-PMP,42.5869578,20.9021231,XK, Latvija,Lettonie,,Latvia,لاتفيا,3,3-PMP,56.8406494,24.7537645,LV, ليبيا,Libye,,Libya,ليبيا,3,3-PMP,26.8234472,18.1236723,LY, Lietuva,Lituanie,,Lithuania,ليتوانيا,3,3-PMP,55.3500003,23.7499997,LT, -Македонија,Macédoine,ARYM,Macedonia,مقدونيا,3,3-PMP,41.6171214,21.7168387,MK, +Македонија,Ancienne République Yougoslave de Macédoine,ARYM,Macedonia,مقدونيا,3,3-PMP,41.6171214,21.7168387,MK, Malaysia,Malaisie,,Malaysia,ماليزي,3,3-PMP,2.3923759,112.8471939,MY, Mali,Mali,,Mali,مالي,3,3-PMP,16.3700359,-2.2900239,ML, Malta,Malte,,Malta,مالطا,3,3-PMP,35.8885993,14.4476911,MT, diff --git a/forte.yml b/forte.yml index ae1ee69..545df58 100644 --- a/forte.yml +++ b/forte.yml @@ -301,8 +301,9 @@ Layer: <<: *db table: |- ( SELECT - geometry, '{lang}' as lang, type, capital, NULL as ldir, + geometry, '{lang}' as lang, type, NULL as ldir, CASE WHEN type='city' THEN 1 WHEN type='state' THEN 2 ELSE 100 END AS prio, + CASE WHEN capital='yes' THEN 1 WHEN capital IN ('4','5','6','7','8','9','10') THEN capital::INT ELSE 100 END AS capital, COALESCE(NULLIF(name{lang}, ''), NULLIF(int_name, ''), name) as name FROM osm_places @@ -325,11 +326,12 @@ Layer: geometry, '{lang}' as lang, capital, CASE WHEN type='city' THEN 1 WHEN type='town' THEN 2 ELSE 100 END AS prio, CASE WHEN type IN ('hamlet', 'suburb', 'isolated_dwelling', 'neighbourhood', 'allotments', 'city_block') THEN 'minor' ELSE type END AS type, - population, COALESCE(NULLIF(name{lang}, ''), name) as name + CASE WHEN capital='yes' THEN 1 WHEN capital IN ('4','5','6','7','8','9','10') THEN capital::INT ELSE 100 END AS capital, + population, COALESCE(NULLIF(name{lang}, ''), NULLIF(int_name, ''), name) as name FROM osm_places ORDER BY - prio, population DESC NULLS LAST + prio, capital ASC, population DESC NULLS LAST ) AS data - id: station @@ -432,7 +434,8 @@ Layer: FROM osm_admin WHERE - admin_level = 3 OR admin_level = 4 + (admin_level = 3 OR admin_level = 4) + AND osm_id < 0 AND geometry && !bbox! ORDER BY admin_level DESC diff --git a/icon/place/capital.svg b/icon/place/capital.svg index 5942794..1640092 100644 --- a/icon/place/capital.svg +++ b/icon/place/capital.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icon/place/city.svg b/icon/place/city.svg index 38b5402..36e50de 100644 --- a/icon/place/city.svg +++ b/icon/place/city.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icon/place/embassy.svg b/icon/place/embassy.svg index 7c5beb0..1f30392 100644 --- a/icon/place/embassy.svg +++ b/icon/place/embassy.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icon/place/intermediate.svg b/icon/place/intermediate.svg index 66148c2..ad4a0b6 100644 --- a/icon/place/intermediate.svg +++ b/icon/place/intermediate.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/icon/place/town.svg b/icon/place/town.svg index 594c113..739ff47 100644 --- a/icon/place/town.svg +++ b/icon/place/town.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/labels.mss b/labels.mss index e8857d3..6d4afec 100644 --- a/labels.mss +++ b/labels.mss @@ -22,46 +22,46 @@ text-dy: 10; text-wrap-width: 60; } + [zoom>=7][sov = null] { + text-size: 16; + } [sov != null] { text-name: [name] + ' ('+[sov]+')'; text-size: 12; } } -#boundary_label_low[zoom>=7][zoom<=10] { - text-name: '[name]'; - text-face-name: @medium; +#boundary_label_low[zoom>=6][zoom<=10] { + text-name: [name]; + text-size: 11; + text-face-name: @regular; text-placement: point; text-fill: @state_text; text-halo-fill: @halo; text-halo-radius: 1; - text-size: 10; - text-wrap-width: 40; - text-margin: 30; + text-wrap-width: 50; + text-label-position-tolerance: 100; + text-margin: 7; [zoom>=7] { - text-size: 11; - text-wrap-width: 50; - } - [zoom>=8] { + text-size: 13; + text-wrap-width: 65; text-halo-radius: 2; text-line-spacing: 1; } [zoom>=9] { - text-size: 12; - text-character-spacing: 1; - text-wrap-width: 80; - text-line-spacing: 2; - } - [zoom>=10] { - text-size: 14; + text-face-name: @bold; + text-size: 18; text-character-spacing: 2; + text-wrap-width: 100; + text-line-spacing: 2; + text-label-position-tolerance: 200; } } #city[zoom>=5][zoom<=10], #place_low[type='city'][zoom>=7][zoom<=10], #place_low[type='town'][zoom>=9][zoom<=10] { shield-file: url('icon/place/[type].svg'); - shield-name:'[name]'; + shield-name:[name]; shield-size: 11; shield-face-name: @regular; shield-halo-radius: 1; @@ -69,13 +69,14 @@ shield-fill: @town_text; shield-halo-fill: @halo; shield-placement-type: simple; - shield-placements: 'NE,SW,NW,SE,E,W'; + shield-placements: 'NE,SW,NW,SE,E,W,N,S'; shield-text-dy: 2; shield-text-dx: 6; shield-unlock-image: true; shield-min-distance: 10; [type='town'] { - shield-text-dx: 2; + shield-text-dx: 4; + shield-text-dy: 4; } [type='city'] { shield-line-spacing: -2; @@ -86,15 +87,13 @@ [type='embassy'], [type='capital'] { shield-fill: @city_text; shield-face-name: @bold; - shield-size: 13; - [type='embassy'] { - shield-allow-overlap: true; - } + shield-size: 12; + shield-allow-overlap: true; } [type='intermediate'] { shield-face-name: @medium; shield-fill: @city_text; - shield-size: 12; + shield-size: 11; } [ldir!=null] { shield-placements: '[ldir]'; @@ -105,13 +104,19 @@ [zoom>=9] { shield-size: 12; [type='embassy'], [type='capital'], [type='intermediate'] { - shield-size: 15; + shield-size: 17; + shield-placements: 'N'; + shield-text-dy: 8; + } + [type='city'] { + shield-size: 14; } } } -#place[type='city'][zoom>=10], -#place[type='town'][zoom>=10], -#place[type='village'][zoom>=9], +#city[zoom>10], +#place[type='city'][zoom>10], +#place[type='town'][zoom>10], +#place[type='village'][zoom>=11], #place[type='minor'][zoom>=14] { text-name: '[name]'; [lang='fr'] { @@ -120,10 +125,10 @@ text-face-name: @light; text-placement: point; text-fill: @village_text; - text-size: 12; + text-size: 11; text-halo-fill: @halo; text-halo-radius: 2; - text-wrap-width: 40; + text-wrap-width: 45; text-label-position-tolerance: 20; text-character-spacing: 0.1; text-line-spacing: -2; @@ -132,10 +137,16 @@ [type='town'] { text-fill: @town_text; text-face-name: @regular; + text-size: 13; } [type='city'] { text-fill: @city_text; text-face-name: @medium; + text-size: 14; + } + [type='intermediate'], [type='embassy'], [type='capital'] { + text-face-name: @bold; + text-size:16; } [type='minor'] { text-margin: 50; @@ -143,22 +154,31 @@ [zoom>=12] { text-margin: 10; text-min-padding: 1; - text-size: 13; - [type='city'] { + text-size: 12; + [type='town'] { text-size: 14; } - } - [zoom>=13] { - text-size: 14; [type='city'] { - text-size: 15; + text-size: 16; + } + [type='intermediate'], [type='embassy'], [type='capital'] { + text-size: 18; } } - [zoom>=14] { - text-size: 15; + [zoom>=13] { + text-size: 13; [type='minor'] { text-size: 10; } + [type='town'] { + text-size: 15; + } + [type='city'] { + text-size: 17; + } + [type='intermediate'], [type='embassy'], [type='capital'] { + text-size: 19; + } } } diff --git a/piano.yml b/piano.yml index 6edb688..4e11b48 100644 --- a/piano.yml +++ b/piano.yml @@ -294,8 +294,9 @@ Layer: <<: *db table: |- ( SELECT - geometry, '{lang}' as lang, type, capital, NULL as ldir, + geometry, '{lang}' as lang, type, NULL as ldir, CASE WHEN type='city' THEN 1 WHEN type='state' THEN 2 ELSE 100 END AS prio, + CASE WHEN capital='yes' THEN 1 WHEN capital IN ('4','5','6','7','8','9','10') THEN capital::INT ELSE 100 END AS capital, COALESCE(NULLIF(name{lang}, ''), NULLIF(int_name, ''), name) as name FROM osm_places @@ -304,7 +305,7 @@ Layer: AND type IN ('state', 'city', 'town') AND geometry && !bbox! ORDER BY - prio, capital ASC, population DESC + prio, capital ASC, population DESC NULLS LAST ) AS data - id: place @@ -315,15 +316,16 @@ Layer: <<: *db table: |- ( SELECT - geometry, '{lang}' as lang, capital, + geometry, '{lang}' as lang, CASE WHEN type='city' THEN 1 WHEN type='town' THEN 2 ELSE 100 END AS prio, CASE WHEN type IN ('hamlet', 'suburb', 'isolated_dwelling', 'neighbourhood', 'allotments', 'city_block') THEN 'minor' ELSE type END AS type, + CASE WHEN capital='yes' THEN 1 WHEN capital IN ('4','5','6','7','8','9','10') THEN capital::INT ELSE 100 END AS capital, population, - COALESCE(NULLIF(name{lang}, ''), name) as name + COALESCE(NULLIF(name{lang}, ''), NULLIF(int_name, ''), name) as name FROM osm_places ORDER BY - prio, population DESC NULLS LAST + prio, capital ASC, population DESC NULLS LAST ) AS data - id: boundary_label_low @@ -338,7 +340,8 @@ Layer: FROM osm_admin WHERE - admin_level = 3 OR admin_level = 4 + (admin_level = 3 OR admin_level = 4) + AND osm_id < 0 AND geometry && !bbox! ORDER BY admin_level DESC diff --git a/piano/base.mss b/piano/base.mss index b69716e..d4c0744 100644 --- a/piano/base.mss +++ b/piano/base.mss @@ -249,7 +249,7 @@ } } } -#roads_gen[type='primary'][zoom>=10][zoom<12], +#roads_gen[type='primary'][zoom>=9][zoom<12], #roads_gen[type='trunk'][zoom>=9][zoom<12], #roads_gen[type='motorway'][zoom>=7][zoom<12], #roads_gen[type='secondary'][zoom=12],