[openstreetmap-carto] 01/06: Imported Upstream version 2.38.0
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Feb 18 22:45:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit 3398eaaf8247b29c1f30751c9a287a76e16daf3d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Feb 18 23:35:00 2016 +0100
Imported Upstream version 2.38.0
---
admin.mss | 81 +++++++++++++++++++++++++++++++++--------
amenity-points.mss | 22 ++++++++++-
landcover.mss | 39 ++++++++++++++++----
placenames.mss | 43 ++++++++++++++++------
project.mml | 22 +++++------
project.yaml | 48 +++++++++++++-----------
shapefiles.mss | 8 +++-
symbols/beach.png | Bin 215 -> 10511 bytes
symbols/beach_coarse.png | Bin 0 -> 51829 bytes
symbols/reef.png | Bin 0 -> 34358 bytes
symbols/social_facility-14.svg | 38 +++++++++++++++++++
symbols/sports-14.svg | 61 +++++++++++++++++++++++++++++++
12 files changed, 293 insertions(+), 69 deletions(-)
diff --git a/admin.mss b/admin.mss
index d586f74..4bc055a 100644
--- a/admin.mss
+++ b/admin.mss
@@ -9,45 +9,86 @@ overlapping borders correctly.
#admin-low-zoom[zoom < 11],
#admin-mid-zoom[zoom >= 11][zoom < 13],
#admin-high-zoom[zoom >= 13] {
- [admin_level = '2'],
- [admin_level = '3'] {
+ [admin_level = '2'] {
[zoom >= 4] {
+ background/line-join: bevel;
background/line-color: white;
- background/line-width: 0.6;
+ background/line-width: 1.2;
+ line-join: bevel;
line-color: @admin-boundaries;
- line-width: 0.6;
+ line-width: 1.2;
+ }
+ [zoom >= 5] {
+ background/line-width: 1.5;
+ line-width: 1.5;
+ }
+ [zoom >= 6] {
+ background/line-width: 1.8;
+ line-width: 1.8;
}
[zoom >= 7] {
background/line-width: 2;
line-width: 2;
}
[zoom >= 10] {
- [admin_level = '2'] {
- background/line-width: 6;
- line-width: 6;
- }
- [admin_level = '3'] {
- background/line-width: 5;
- line-width: 5;
- line-dasharray: 4,2;
- line-clip: false;
- }
+ background/line-width: 6;
+ line-width: 6;
}
}
- [admin_level = '4'] {
+
+ [admin_level = '3'] {
[zoom >= 4] {
+ background/line-join: bevel;
background/line-color: white;
background/line-width: 0.6;
+ line-join: bevel;
line-color: @admin-boundaries;
line-width: 0.6;
+ }
+ [zoom >= 7] {
+ background/line-width: 1.2;
+ line-width: 1.2;
+ }
+ [zoom >= 10] {
+ background/line-width: 4;
+ line-width: 4;
+ line-dasharray: 4,2;
+ line-clip: false;
+ }
+ }
+
+ [admin_level = '4'] {
+ [zoom >= 4] {
+ background/line-join: bevel;
+ background/line-color: white;
+ background/line-width: 0.4;
+ line-color: @admin-boundaries;
+ line-join: bevel;
+ line-width: 0.4;
line-dasharray: 4,3;
line-clip: false;
}
+ [zoom >= 5] {
+ background/line-width: 0.6;
+ line-width: 0.6;
+ }
+ [zoom >= 6] {
+ background/line-width: 0.8;
+ line-width: 0.8;
+ }
[zoom >= 7] {
background/line-width: 1;
line-width: 1;
}
- [zoom >= 11] {
+ [zoom >= 9] {
+ background/line-width: 1.8;
+ line-width: 1.8;
+ }
+ [zoom >= 10] {
+ background/line-width: 2.5;
+ line-width: 2.5;
+ }
+ [zoom >= 12] {
background/line-width: 3;
line-width: 3;
}
@@ -70,16 +111,20 @@ overlapping borders correctly.
#admin-mid-zoom[zoom >= 11][zoom < 13],
#admin-high-zoom[zoom >= 13] {
[admin_level = '5'][zoom >= 11] {
+ background/line-join: bevel;
background/line-color: white;
background/line-width: 2;
+ line-join: bevel;
line-color: @admin-boundaries;
line-width: 2;
line-dasharray: 6,3,2,3,2,3;
line-clip: false;
}
[admin_level = '6'][zoom >= 11] {
+ background/line-join: bevel;
background/line-color: white;
background/line-width: 2;
+ line-join: bevel;
line-color: @admin-boundaries;
line-width: 2;
line-dasharray: 6,3,2,3;
@@ -88,8 +133,10 @@ overlapping borders correctly.
[admin_level = '7'],
[admin_level = '8'] {
[zoom >= 12] {
+ background/line-join: bevel;
background/line-color: white;
background/line-width: 1.5;
+ line-join: bevel;
line-color: @admin-boundaries;
line-width: 1.5;
line-dasharray: 5,2;
@@ -104,8 +151,10 @@ overlapping borders correctly.
[admin_level = '9'],
[admin_level = '10'] {
[zoom >= 13] {
+ background/line-join: bevel;
background/line-color: white;
background/line-width: 2;
+ line-join: bevel;
line-color: @admin-boundaries;
line-width: 2;
line-dasharray: 2,3;
diff --git a/amenity-points.mss b/amenity-points.mss
index 9a5a8c7..a5533d8 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -275,6 +275,13 @@
marker-clip: false;
}
+ [feature = 'amenity_social_facility'][zoom >= 17] {
+ marker-file: url('symbols/social_facility-14.svg');
+ marker-fill: @amenity-brown;
+ marker-placement: interior;
+ marker-clip: false;
+ }
+
[feature = 'amenity_townhall'][zoom >= 16] {
marker-file: url('symbols/town_hall.16.svg');
marker-fill: @amenity-brown;
@@ -870,6 +877,13 @@
marker-fill: @shop-icon;
}
+ [feature = 'shop_sports'][zoom >= 17] {
+ marker-file: url('symbols/sports-14.svg');
+ marker-fill: @shop-icon;
+ marker-placement: interior;
+ marker-clip: false;
+ }
+
[feature = 'shop_stationery'][zoom >= 17] {
marker-file: url('symbols/stationery-14.svg');
marker-placement: interior;
@@ -1206,6 +1220,7 @@
[feature = 'amenity_police'][zoom >= 17],
[feature = 'amenity_car_wash'][zoom >= 17],
[feature = 'amenity_community_centre'][zoom >= 17],
+ [feature = 'amenity_social_facility'][zoom >= 17],
[feature = 'amenity_fire_station'][zoom >= 17],
[feature = 'amenity_drinking_water'][zoom >= 17],
[feature = 'tourism_picnic_site'][zoom >= 17],
@@ -1486,6 +1501,8 @@
[feature = 'natural_heath'],
[feature = 'natural_scrub'],
[feature = 'natural_beach'],
+ [feature = 'natural_shoal'],
+ [feature = 'natural_reef'],
[feature = 'leisure_sports_centre'],
[feature = 'leisure_stadium'],
[feature = 'leisure_track'],
@@ -1509,6 +1526,7 @@
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-placement: interior;
+ [feature = 'natural_reef'],
[feature = 'natural_wetland'],
[feature = 'natural_marsh'],
[feature = 'natural_mud'] {
@@ -1594,7 +1612,8 @@
[feature = 'natural_scrub'] {
text-fill: darken(@scrub, 60%);
}
- [feature = 'natural_beach'] {
+ [feature = 'natural_beach'],
+ [feature = 'natural_shoal'] {
text-fill: darken(@beach, 60%);
}
[feature = 'leisure_sports_centre'],
@@ -1870,6 +1889,7 @@
[feature = 'shop_toys'],
[feature = 'shop_travel_agency'],
[feature = 'shop_seafood'],
+ [feature = 'shop_sports'],
[feature = 'shop_stationery'],
[feature = 'shop_variety_store'],
[feature = 'shop_wine'],
diff --git a/landcover.mss b/landcover.mss
index a391419..132b135 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -487,12 +487,11 @@
[way_pixels >= 64] { polygon-gamma: 0.3; }
}
- [feature = 'natural_beach'][zoom >= 10] {
+ [feature = 'natural_beach'][zoom >= 10],
+ [feature = 'natural_shoal'][zoom >= 10] {
polygon-fill: @beach;
- polygon-pattern-file: url('symbols/beach.png');
- polygon-pattern-alignment: global;
- [way_pixels >= 4] { polygon-pattern-gamma: 0.75; }
- [way_pixels >= 64] { polygon-pattern-gamma: 0.3; }
+ [way_pixels >= 4] { polygon-gamma: 0.75; }
+ [way_pixels >= 64] { polygon-gamma: 0.3; }
}
[feature = 'highway_services'],
@@ -541,12 +540,15 @@
/* man_made=cutline */
#landcover-line {
[zoom >= 14] {
- line-width: 1.5;
+ line-width: 3;
line-join: round;
line-cap: square;
- line-color: @land-color;
+ line-color: @grass;
[zoom >= 16] {
- line-width: 2;
+ line-width: 6;
+ [zoom >= 18] {
+ line-width: 12;
+ }
}
}
}
@@ -556,6 +558,10 @@
polygon-pattern-file: url('symbols/wetland.png');
polygon-pattern-alignment: global;
}
+ [natural = 'reef'][zoom >= 10] {
+ polygon-pattern-file: url('symbols/reef.png');
+ polygon-pattern-alignment: global;
+ }
[zoom >= 14] {
[int_wetland = 'marsh'],
[int_wetland = 'saltmarsh'],
@@ -581,6 +587,23 @@
polygon-pattern-file: url('symbols/wetland_bog.png');
polygon-pattern-alignment: global;
}
+ [natural = 'beach'],
+ [natural = 'shoal'] {
+ [surface = 'sand'] {
+ polygon-pattern-file: url('symbols/beach.png');
+ polygon-pattern-alignment: global;
+ }
+ [surface = 'gravel'],
+ [surface = 'fine_gravel'],
+ [surface = 'pebbles'],
+ [surface = 'pebblestone'],
+ [surface = 'shingle'],
+ [surface = 'stones'],
+ [surface = 'shells'] {
+ polygon-pattern-file: url('symbols/beach_coarse.png');
+ polygon-pattern-alignment: global;
+ }
+ }
}
//Also landuse = forest, converted in the SQL
[natural = 'wood'][zoom >= 13]::wood {
diff --git a/placenames.mss b/placenames.mss
index 6137660..ec05e60 100644
--- a/placenames.mss
+++ b/placenames.mss
@@ -1,18 +1,38 @@
@placenames: #222;
@placenames-light: #777777;
+ at country-labels: darken(@admin-boundaries, 15%);
+ at state-labels: desaturate(darken(@admin-boundaries, 5%), 20%);
.country {
- [admin_level = '2'][zoom >= 2][way_pixels > 3000][way_pixels < 196000] {
+ [admin_level = '2'][zoom >= 3][way_pixels > 1000][way_pixels < 360000] {
text-name: "[name]";
text-size: 9;
- text-fill: #9d6c9d;
+
+ [zoom >= 3] {
+ text-size: 10;
+ }
+ [zoom >= 4] {
+ text-size: 11;
+ }
+ [zoom >= 5] {
+ text-size: 12;
+ }
+ [zoom >= 7] {
+ text-size: 13;
+ }
+ [zoom >= 10] {
+ text-size: 14;
+ }
+
+ text-fill: @country-labels;
text-face-name: @book-fonts;
+ text-halo-fill: rgba(255,255,255,0.6);
text-halo-radius: 1.5;
- text-wrap-width: 50;
+ text-wrap-width: 35;
text-placement: interior;
- [zoom >= 4] {
- text-size: 10;
- }
+ text-character-spacing: 0.5;
+ text-min-distance: 3;
+ text-line-spacing: 1;
}
}
@@ -22,18 +42,20 @@
[zoom >= 5][way_pixels > 3000][way_pixels < 196000] {
text-name: "[ref]";
text-size: 9;
- text-fill: #9d6c9d;
+ text-fill: @state-labels;
text-face-name: @oblique-fonts;
+ text-halo-fill: rgba(255,255,255,0.6);
text-halo-radius: 1.5;
text-wrap-width: 0;
text-placement: interior;
+ text-min-distance: 3;
[zoom >= 5] {
text-name: "[name]";
- text-wrap-width: 50;
+ text-wrap-width: 30;
}
[zoom >= 7] {
text-size: 11;
- text-wrap-width: 70;
+ text-wrap-width: 50;
}
}
}
@@ -41,7 +63,6 @@
#placenames-medium::high-importance {
[category = 1][zoom < 14] {
- [zoom >= 3][score >= 5000000],
[zoom >= 4][score >= 3000000],
[zoom >= 5][score >= 400000] {
text-name: "[name]";
@@ -179,7 +200,7 @@
[place = 'farm'] {
[zoom >= 15] {
text-name: "[name]";
- text-size: 9;
+ text-size: 10;
text-fill: @placenames;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
diff --git a/project.mml b/project.mml
index ebce0cd..2912f08 100644
--- a/project.mml
+++ b/project.mml
@@ -126,7 +126,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way, name, religion, way_pixels,\n COALESCE(aeroway, amenity, wetland, power, landuse, leisure, military, \"natural\", tourism, highway, railway) AS feature\n FROM (SELECT\n way, COALESCE(name, '') AS name,\n ('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,\n ('amenity_' || (CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school', \n [...]
+ "table": "(SELECT\n way, name, religion, way_pixels,\n COALESCE(aeroway, amenity, wetland, power, landuse, leisure, military, \"natural\", tourism, highway, railway) AS feature\n FROM (SELECT\n way, COALESCE(name, '') AS name,\n ('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,\n ('amenity_' || (CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school', \n [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -279,7 +279,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n COALESCE(\"natural\", CASE WHEN landuse = 'forest' THEN 'wood' ELSE NULL END) AS \"natural\",\n CASE WHEN \"natural\" IN ('marsh', 'mud') \n THEN \"natural\" \n ELSE CASE WHEN (\"natural\" = 'wetland' AND wetland IS NULL) \n THEN 'wetland' \n ELSE CASE WHEN (\"natural\" = 'wetland')\n THEN wetland\n ELSE NULL\n END \n END\n END AS int_wetland\n FROM planet_osm_polygon [...]
+ "table": "(SELECT\n way, surface, \n COALESCE(\"natural\", CASE WHEN landuse = 'forest' THEN 'wood' ELSE NULL END) AS \"natural\",\n CASE WHEN \"natural\" IN ('marsh', 'mud') \n THEN \"natural\" \n ELSE CASE WHEN (\"natural\" = 'wetland' AND wetland IS NULL) \n THEN 'wetland' \n ELSE CASE WHEN (\"natural\" = 'wetland')\n THEN wetland\n ELSE NULL\n END \n END\n END AS int_wetland\n FROM planet_o [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -666,7 +666,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way, barrier\n FROM planet_osm_line\n WHERE barrier IS NOT NULL\n) AS line_barriers",
+ "table": "(SELECT\n way, barrier\n FROM planet_osm_line\n WHERE barrier IN ('chain', 'city_wall', 'embankment', 'ditch', 'fence', 'guard_rail',\n 'handrail', 'hedge', 'kerb', 'retaining_wall', 'wall')\n AND (waterway IS NULL OR waterway NOT IN ('river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi'))\n) AS line_barriers",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -679,7 +679,7 @@
85.05112877980659
],
"properties": {
- "minzoom": 16
+ "minzoom": 14
},
"advanced": {}
},
@@ -1056,7 +1056,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4')\n ORDER BY admin_level DESC\n) AS admin_low_zoom",
+ "table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4')\n AND osm_id < 0\n ORDER BY admin_level DESC\n) AS admin_low_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1083,7 +1083,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')\n ORDER BY admin_level DESC\n) AS admin_mid_zoom",
+ "table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')\n AND osm_id < 0\n ORDER BY admin_level DESC\n) AS admin_mid_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1110,7 +1110,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')\n ORDER BY admin_level::integer DESC -- With 10 as a valid value, we need to do a numeric ordering, not a text ordering\n) AS admin_high_zoom",
+ "table": "(SELECT\n way,\n admin_level\n FROM planet_osm_roads\n WHERE boundary = 'administrative'\n AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')\n AND osm_id < 0\n ORDER BY admin_level::integer DESC -- With 10 as a valid value, we need to do a numeric ordering, not a text ordering\n) AS admin_high_zoom",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1397,7 +1397,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', \n 'hostel', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', ' [...]
+ "table": "(SELECT\n way,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', \n 'hostel', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', ' [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1423,7 +1423,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel', \n 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', ' [...]
+ "table": "(SELECT\n way,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel', \n 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', ' [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1711,7 +1711,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', \n 'theme_park', 'museum', 'zoo', 'information', 'picnic_site') THEN [...]
+ "table": "(SELECT\n way,\n way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels,\n COALESCE(\n 'aeroway_' || CASE WHEN aeroway IN ('gate', 'apron', 'helipad', 'aerodrome') THEN aeroway ELSE NULL END,\n 'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', \n 'theme_park', 'museum', 'zoo', 'information', 'picnic_site') THEN [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1763,7 +1763,7 @@
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
"extent": "-20037508,-20037508,20037508,20037508",
- "table": "(SELECT\n way,\n way_pixels,\n feature,\n access,\n CONCAT(\n name,\n CASE WHEN name IS NOT NULL AND elevation IS NOT NULL THEN E'\\n' ELSE NULL END,\n CASE WHEN elevation IS NOT NULL THEN CONCAT(REPLACE(ROUND(elevation)::TEXT, '-', U&'\\2212'), U&'\\00A0', 'm') ELSE NULL END\n ) AS name,\n CASE\n WHEN \"natural\" IN ('peak', 'volcano', 'saddle') THEN elevation\n ELSE NULL\n END AS score,\n operator,\n ref,\n [...]
+ "table": "(SELECT\n way,\n way_pixels,\n feature,\n access,\n CONCAT(\n name,\n CASE WHEN name IS NOT NULL AND elevation IS NOT NULL THEN E'\\n' ELSE NULL END,\n CASE WHEN elevation IS NOT NULL THEN CONCAT(REPLACE(ROUND(elevation)::TEXT, '-', U&'\\2212'), U&'\\00A0', 'm') ELSE NULL END\n ) AS name,\n CASE\n WHEN \"natural\" IN ('peak', 'volcano', 'saddle') THEN elevation\n ELSE NULL\n END AS score,\n operator,\n ref,\n [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
diff --git a/project.yaml b/project.yaml
index 28d7901..a2ecd19 100644
--- a/project.yaml
+++ b/project.yaml
@@ -154,7 +154,7 @@ Layer:
'golf_course', 'miniature_golf', 'picnic_table', 'sports_centre', 'stadium', 'pitch',
'track') THEN leisure ELSE NULL END)) AS leisure,
('military_' || (CASE WHEN military IN ('danger_area') THEN military ELSE NULL END)) AS military,
- ('natural_' || (CASE WHEN "natural" IN ('beach', 'heath', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub') THEN "natural" ELSE NULL END)) AS "natural",
+ ('natural_' || (CASE WHEN "natural" IN ('beach', 'shoal', 'heath', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub') THEN "natural" ELSE NULL END)) AS "natural",
('wetland_' || (CASE WHEN "natural" IN ('wetland', 'marsh', 'mud') THEN (CASE WHEN "natural" IN ('marsh', 'mud') THEN "natural" ELSE wetland END) ELSE NULL END)) AS wetland,
('power_' || (CASE WHEN power IN ('station', 'sub_station', 'substation', 'generator') THEN power ELSE NULL END)) AS power,
('tourism_' || (CASE WHEN tourism IN ('attraction', 'camp_site', 'caravan_site', 'picnic_site') THEN tourism ELSE NULL END)) AS tourism,
@@ -169,7 +169,7 @@ Layer:
OR amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school', 'hospital', 'kindergarten',
'grave_yard', 'place_of_worship', 'prison', 'clinic')
OR military IN ('danger_area')
- OR "natural" IN ('beach', 'heath', 'mud', 'marsh', 'wetland', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub')
+ OR "natural" IN ('beach', 'shoal', 'heath', 'mud', 'marsh', 'wetland', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub')
OR power IN ('station', 'sub_station', 'substation', 'generator')
OR tourism IN ('attraction', 'camp_site', 'caravan_site', 'picnic_site')
OR highway IN ('services', 'rest_area')
@@ -277,7 +277,7 @@ Layer:
<<: *osm2pgsql
table: |-
(SELECT
- way,
+ way, surface,
COALESCE("natural", CASE WHEN landuse = 'forest' THEN 'wood' ELSE NULL END) AS "natural",
CASE WHEN "natural" IN ('marsh', 'mud')
THEN "natural"
@@ -290,7 +290,7 @@ Layer:
END
END AS int_wetland
FROM planet_osm_polygon
- WHERE ("natural" IN ('marsh', 'mud', 'wetland', 'wood') OR landuse = 'forest')
+ WHERE ("natural" IN ('marsh', 'mud', 'wetland', 'wood', 'beach', 'shoal', 'reef') OR landuse = 'forest')
AND building IS NULL
AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real
ORDER BY z_order, way_area DESC
@@ -665,10 +665,12 @@ Layer:
(SELECT
way, barrier
FROM planet_osm_line
- WHERE barrier IS NOT NULL
+ WHERE barrier IN ('chain', 'city_wall', 'embankment', 'ditch', 'fence', 'guard_rail',
+ 'handrail', 'hedge', 'kerb', 'retaining_wall', 'wall')
+ AND (waterway IS NULL OR waterway NOT IN ('river', 'canal', 'derelict_canal', 'stream', 'drain', 'ditch', 'wadi'))
) AS line_barriers
properties:
- minzoom: 16
+ minzoom: 14
advanced: {}
- id: "cliffs"
name: "cliffs"
@@ -1325,6 +1327,7 @@ Layer:
FROM planet_osm_roads
WHERE boundary = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4')
+ AND osm_id < 0
ORDER BY admin_level DESC
) AS admin_low_zoom
properties:
@@ -1344,6 +1347,7 @@ Layer:
FROM planet_osm_roads
WHERE boundary = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8')
+ AND osm_id < 0
ORDER BY admin_level DESC
) AS admin_mid_zoom
properties:
@@ -1364,6 +1368,7 @@ Layer:
FROM planet_osm_roads
WHERE boundary = 'administrative'
AND admin_level IN ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '10')
+ AND osm_id < 0
ORDER BY admin_level::integer DESC -- With 10 as a valid value, we need to do a numeric ordering, not a text ordering
) AS admin_high_zoom
properties:
@@ -1628,7 +1633,7 @@ Layer:
'bicycle_parking', 'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship',
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court',
'fast_food', 'telephone', 'emergency_phone', 'taxi', 'theatre', 'toilets', 'drinking_water',
- 'prison', 'hunting_stand', 'nightclub', 'veterinary') THEN amenity ELSE NULL END,
+ 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer',
'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'florist',
'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet',
@@ -1636,7 +1641,7 @@ Layer:
'mobile_phone', 'motorcycle', 'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery',
'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery',
'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor',
- 'copyshop') THEN shop
+ 'copyshop', 'sports') THEN shop
WHEN shop IN ('accessories', 'antiques', 'appliance', 'art', 'baby_goods', 'bathroom_furnishing',
'bed', 'boat', 'bookmaker', 'boutique', 'builder', 'building_materials', 'camera', 'car_service',
'carpet', 'charity', 'cheese', 'chocolate', 'coffee', 'communication', 'craft', 'curtain', 'dairy',
@@ -1647,7 +1652,7 @@ Layer:
'leather', 'lighting', 'locksmith', 'lottery', 'market', 'massage', 'medical', 'medical_supply', 'money_lender',
'motorcycle_repair', 'music', 'office_supplies', 'organic', 'paint', 'pastry', 'pawnbroker',
'phone', 'pottery', 'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon',
- 'scuba_diving', 'second_hand', 'sewing', 'shoe_repair', 'shopping_centre', 'solarium', 'souvenir', 'sports',
+ 'scuba_diving', 'second_hand', 'sewing', 'shoe_repair', 'shopping_centre', 'solarium', 'souvenir',
'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'trade', 'tyres', 'vacuum_cleaner', 'video',
'video_games', 'watches', 'wholesale', 'yes') THEN 'other' ELSE NULL END,
'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table') THEN leisure ELSE NULL END,
@@ -1675,7 +1680,8 @@ Layer:
'townhall', 'parking', 'bicycle_parking', 'motorcycle_parking', 'pharmacy', 'doctors',
'dentist', 'place_of_worship', 'police', 'post_box', 'post_office', 'pub', 'biergarten',
'recycling', 'restaurant', 'food_court', 'fast_food', 'telephone', 'emergency_phone', 'taxi',
- 'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub', 'veterinary')
+ 'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub', 'veterinary',
+ 'social_facility')
OR shop IS NOT NULL -- skip checking a huge list and use a null check
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table')
OR man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill')
@@ -1708,14 +1714,14 @@ Layer:
'bicycle_parking', 'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship',
'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court',
'fast_food', 'telephone', 'emergency_phone', 'taxi', 'theatre', 'toilets', 'drinking_water',
- 'prison', 'hunting_stand', 'nightclub', 'veterinary') THEN amenity ELSE NULL END,
+ 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery',
'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'florist', 'garden_centre',
'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio',
'photography', 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle',
'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys',
'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages',
- 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop') THEN shop
+ 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports') THEN shop
WHEN shop IN ('accessories', 'antiques', 'appliance', 'art', 'baby_goods', 'bathroom_furnishing', 'bed',
'boat', 'bookmaker', 'boutique', 'builder', 'building_materials', 'camera', 'car_service', 'carpet', 'charity',
'cheese', 'chocolate', 'coffee', 'communication', 'craft', 'curtain', 'dairy', 'deli',
@@ -1726,7 +1732,7 @@ Layer:
'market', 'massage', 'medical', 'medical_supply', 'money_lender', 'motorcycle_repair', 'music', 'office_supplies',
'organic', 'paint', 'pastry', 'pawnbroker', 'phone', 'pottery', 'printing', 'radiotechnics',
'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'second_hand', 'sewing', 'shoe_repair', 'shopping_centre',
- 'solarium', 'souvenir', 'sports', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'trade', 'tyres',
+ 'solarium', 'souvenir', 'tailor', 'tanning', 'tattoo', 'tea', 'ticket', 'tiles', 'tobacco', 'trade', 'tyres',
'vacuum_cleaner', 'video', 'video_games', 'watches', 'wholesale', 'yes') THEN 'other' ELSE NULL END,
'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway') THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill') THEN man_made ELSE NULL END,
@@ -1764,7 +1770,7 @@ Layer:
'dentist', 'place_of_worship', 'police', 'post_box', 'post_office', 'pub', 'biergarten',
'recycling', 'restaurant', 'food_court', 'fast_food', 'telephone', 'emergency_phone',
'taxi', 'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub',
- 'veterinary')
+ 'veterinary', 'social_facility')
OR shop IS NOT NULL -- skip checking a huge list and use a null check
OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway')
OR man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill', 'cross')
@@ -2025,14 +2031,14 @@ Layer:
'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'dentist',
'atm', 'bicycle_rental', 'car_rental', 'car_wash', 'post_box', 'post_office',
'recycling', 'telephone', 'emergency_phone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand',
- 'nightclub', 'veterinary') THEN amenity ELSE NULL END,
+ 'nightclub', 'veterinary', 'social_facility') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery',
'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'florist', 'garden_centre',
'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio',
'photography', 'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle',
'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys',
'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages',
- 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop') THEN shop
+ 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports') THEN shop
WHEN shop IN ('accessories', 'antiques', 'appliance', 'art', 'baby_goods', 'bathroom_furnishing', 'bed',
'boat', 'bookmaker', 'boutique', 'builder', 'building_materials', 'camera', 'car_service', 'carpet', 'charity',
'cheese', 'chocolate', 'coffee', 'communication', 'craft', 'curtain', 'dairy', 'deli',
@@ -2043,7 +2049,7 @@ Layer:
'lottery', 'market', 'massage', 'medical', 'medical_supply', 'money_lender', 'motorcycle_repair', 'music',
'office_supplies', 'organic', 'paint', 'pastry', 'pawnbroker', 'phone', 'pottery',
'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'second_hand',
- 'sewing', 'shoe_repair', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'tailor', 'tanning', 'tattoo', 'tea',
+ 'sewing', 'shoe_repair', 'shopping_centre', 'solarium', 'souvenir', 'tailor', 'tanning', 'tattoo', 'tea',
'ticket', 'tiles', 'tobacco', 'trade', 'tyres', 'vacuum_cleaner', 'video', 'video_games', 'watches', 'wholesale',
'yes') THEN 'other' ELSE NULL END,
'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 'track',
@@ -2056,7 +2062,7 @@ Layer:
'construction', 'military') THEN landuse ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('lighthouse', 'windmill', 'mast', 'water_tower', 'pier', 'breakwater', 'groyne') THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath',
- 'grassland', 'scrub', 'beach', 'glacier') THEN "natural" ELSE NULL END,
+ 'grassland', 'scrub', 'beach', 'shoal', 'reef', 'glacier') THEN "natural" ELSE NULL END,
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site') THEN historic ELSE NULL END,
@@ -2164,14 +2170,14 @@ Layer:
'embassy', 'fuel', 'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 'hospital',
'ice_cream', 'pharmacy', 'doctors', 'dentist', 'atm', 'bicycle_rental', 'car_rental',
'car_wash', 'post_box', 'post_office', 'recycling', 'telephone', 'emergency_phone', 'toilets', 'taxi',
- 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary') THEN amenity ELSE NULL END,
+ 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility') THEN amenity ELSE NULL END,
'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion',
'convenience', 'department_store', 'doityourself', 'hardware', 'florist', 'garden_centre', 'hairdresser',
'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', 'photo', 'photo_studio', 'photography',
'seafood', 'shoes', 'alcohol', 'gift', 'furniture', 'kiosk', 'mobile_phone', 'motorcycle', 'musical_instrument',
'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts',
'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics',
- 'variety_store', 'wine', 'outdoor', 'copyshop') THEN shop
+ 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports') THEN shop
WHEN shop IN ('accessories', 'antiques', 'appliance', 'art',
'baby_goods', 'bathroom_furnishing', 'bed', 'boat', 'bookmaker', 'boutique', 'builder',
'building_materials', 'camera', 'car_service', 'carpet', 'charity', 'cheese', 'chocolate', 'coffee',
@@ -2183,7 +2189,7 @@ Layer:
'lottery', 'market', 'massage', 'medical', 'medical_supply', 'money_lender', 'motorcycle_repair', 'music',
'office_supplies', 'organic', 'paint', 'pastry', 'pawnbroker', 'phone', 'pottery',
'printing', 'radiotechnics', 'real_estate', 'religion', 'rental', 'salon', 'scuba_diving', 'second_hand',
- 'sewing', 'shoe_repair', 'shopping_centre', 'solarium', 'souvenir', 'sports', 'tailor', 'tanning', 'tattoo',
+ 'sewing', 'shoe_repair', 'shopping_centre', 'solarium', 'souvenir', 'tailor', 'tanning', 'tattoo',
'tea', 'ticket', 'tiles', 'tobacco', 'trade', 'tyres', 'vacuum_cleaner', 'video', 'video_games', 'watches',
'wholesale', 'yes') THEN 'other' ELSE NULL END,
'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 'track',
diff --git a/shapefiles.mss b/shapefiles.mss
index 5b3d1c0..1274b57 100644
--- a/shapefiles.mss
+++ b/shapefiles.mss
@@ -1,6 +1,12 @@
#necountries {
[zoom >= 1][zoom < 4] {
- line-width: 0.5;
+ line-width: 0.2;
+ [zoom >= 2] {
+ line-width: 0.3;
+ }
+ [zoom >= 3] {
+ line-width: 0.4;
+ }
line-color: @admin-boundaries;
}
}
diff --git a/symbols/beach.png b/symbols/beach.png
index 7f582ca..0e8948c 100644
Binary files a/symbols/beach.png and b/symbols/beach.png differ
diff --git a/symbols/beach_coarse.png b/symbols/beach_coarse.png
new file mode 100644
index 0000000..400356e
Binary files /dev/null and b/symbols/beach_coarse.png differ
diff --git a/symbols/reef.png b/symbols/reef.png
new file mode 100644
index 0000000..35ddbe0
Binary files /dev/null and b/symbols/reef.png differ
diff --git a/symbols/social_facility-14.svg b/symbols/social_facility-14.svg
new file mode 100644
index 0000000..db5621f
--- /dev/null
+++ b/symbols/social_facility-14.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ id="svg2"
+ viewBox="0 0 14 14"
+ height="100%"
+ width="100%"
+ version="1.1">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <rect
+ style="fill:none;stroke:none;visibility:hidden"
+ id="canvas"
+ y="0"
+ x="0"
+ height="14"
+ width="14" />
+ <path
+ id="path5687"
+ d="M 7.0078125 0.041015625 C 6.1796632 0.041015535 5.5082053 0.6932389 5.5078125 1.4980469 C 5.507095 2.3036176 6.1788781 2.9570315 7.0078125 2.9570312 C 7.8367469 2.9570315 8.50853 2.3036176 8.5078125 1.4980469 C 8.5074197 0.6932389 7.8359618 0.041015535 7.0078125 0.041015625 z M 1.5 1.5 A 0.5 0.5 0 0 0 1 2 L 1 8 C 1 9 0.99942295 9 2.1679688 10 C 2.999423 11 3 11 3 12 L 3 14 L 6 14 L 6 11 C 6 10.210871 5.5867649 10.262622 5 10 C 3.2611238 9 2 8 2 7 L 2 2 A 0.5 0.5 0 0 0 1.5 1.5 z M [...]
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1" />
+</svg>
diff --git a/symbols/sports-14.svg b/symbols/sports-14.svg
new file mode 100644
index 0000000..29360af
--- /dev/null
+++ b/symbols/sports-14.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ version="1.1"
+ x="0px"
+ y="0px"
+ width="14"
+ height="14"
+ viewBox="0 0 14 14"
+ enable-background="new 0 0 580 580"
+ xml:space="preserve"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="sports-14-33.svg"><metadata
+ id="metadata21"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs19" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1871"
+ inkscape:window-height="1056"
+ id="namedview17"
+ showgrid="true"
+ inkscape:zoom="63.5"
+ inkscape:cx="4.2204724"
+ inkscape:cy="7"
+ inkscape:window-x="49"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g9"
+ showguides="false"><inkscape:grid
+ type="xygrid"
+ id="grid4149" /></sodipodi:namedview><g
+ id="g7"
+ inkscape:version="0.46"
+ sodipodi:docname="waste_bin.svg"
+ sodipodi:version="0.32"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ transform="matrix(0.01926427,0,0,0.03311953,1.6923267,-2.5759903)"
+ style="fill:#000000"><g
+ id="g9"
+ style="fill:#000000"
+ transform="matrix(1.4591054,0,0,1,-148.6728,0)"><path
+ id="path4286"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
+ d="m 238.89676,116.29334 a 45.100662,38.039265 0 0 1 -45.10066,38.03927 45.100662,38.039265 0 0 1 -45.10067,-38.03927 45.100662,38.039265 0 0 1 45.10067,-38.039262 45.100662,38.039265 0 0 1 45.10066,38.039262 z m 243.77432,258.42928 -95.3828,20.80672 c -3.89598,0.84986 -12.52553,0.0999 -15.79245,-0.5834 -8.37243,-1.37786 -10.77986,-4.67843 -14.05622,-8.1298 l -45.15761,-63.14979 -56.77085,51.7179 22.92164,96.69659 c 0.73307,2.07351 1.09961,3.79863 1.09961,5.17648 0,6.2071 -2.364 [...]
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git
More information about the Pkg-grass-devel
mailing list