[osm-tile-server] 36/70: Imported Upstream version 2.35.0
Ruben Undheim
rubund-guest at moszumanska.debian.org
Tue Nov 3 23:13:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository osm-tile-server.
commit a5f120c84806aaed123a95f00df76d1c2fd14783
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Sep 18 00:57:45 2015 +0200
Imported Upstream version 2.35.0
---
amenity-points.mss | 30 +++++++------
landcover.mss | 3 +-
power.mss | 14 ++++--
project.mml | 10 ++---
project.yaml | 18 ++++----
scripts/shop_values.rb | 3 +-
symbols/ford.16.svg | 14 ++++++
symbols/generating_patterns/bare_ground.md | 8 ++++
symbols/generating_patterns/bog.svg | 9 ++++
symbols/generating_patterns/forest.md | 11 +++++
symbols/generating_patterns/forest.svg | 11 +++++
symbols/generating_patterns/mangrove.svg | 9 ++++
symbols/generating_patterns/marsh.svg | 9 ++++
symbols/generating_patterns/reed.svg | 9 ++++
symbols/generating_patterns/rock.svg | 9 ++++
symbols/generating_patterns/rock_overlay at 2x.png | Bin 0 -> 366422 bytes
symbols/generating_patterns/scree.svg | 9 ++++
symbols/generating_patterns/scree_overlay at 2x.png | Bin 0 -> 193106 bytes
symbols/generating_patterns/swamp.svg | 9 ++++
symbols/generating_patterns/wetland.md | 16 +++++++
symbols/generating_patterns/wetland.svg | 9 ++++
symbols/generating_patterns/wetland_bog at 2x.png | Bin 0 -> 62283 bytes
symbols/generating_patterns/wetland_generic at 2x.png | Bin 0 -> 2775 bytes
.../generating_patterns/wetland_mangrove at 2x.png | Bin 0 -> 87241 bytes
symbols/generating_patterns/wetland_marsh at 2x.png | Bin 0 -> 87828 bytes
symbols/generating_patterns/wetland_reed at 2x.png | Bin 0 -> 111331 bytes
symbols/generating_patterns/wetland_swamp at 2x.png | Bin 0 -> 75742 bytes
symbols/nightclub.14.svg | 40 ++++++++++++++++++
symbols/nightclub.18.svg | 47 ---------------------
symbols/rock_overlay.png | Bin 98024 -> 97723 bytes
symbols/scree_overlay.png | Bin 44048 -> 34358 bytes
symbols/transport_ford.p.16.png | Bin 490 -> 0 bytes
32 files changed, 217 insertions(+), 80 deletions(-)
diff --git a/amenity-points.mss b/amenity-points.mss
index cad3ae8..8fa0a4d 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1,6 +1,7 @@
@marina-text: #576ddf; // also swimming_pool
@wetland-text: darken(#4aa5fa, 25%); /* Also for marsh and mud */
@shop-icon: #ac39ac;
+ at shop-text: #939;
@transportation-icon: #0092da;
@transportation-text: #0066ff;
@airtransport: #8461C4;
@@ -115,8 +116,10 @@
}
[feature = 'highway_ford'][zoom >= 16] {
- point-file: url('symbols/transport_ford.p.16.png');
- point-placement: interior;
+ marker-file: url('symbols/ford.16.svg');
+ marker-fill: @transportation-icon;
+ marker-placement: interior;
+ marker-clip: false;
}
[feature = 'tourism_caravan_site'][zoom >= 16] {
@@ -151,7 +154,7 @@
}
[feature = 'amenity_nightclub'][zoom >= 17] {
- marker-file: url('symbols/nightclub.18.svg');
+ marker-file: url('symbols/nightclub.14.svg');
marker-fill: @amenity-brown;
marker-placement: interior;
marker-clip: false;
@@ -1010,13 +1013,13 @@
[amenity = 'bench'][zoom >= 19]::amenity {
marker-file: url('symbols/bench.16.svg');
- marker-fill: #744a08;
+ marker-fill: @amenity-brown;
marker-placement: interior;
}
[amenity = 'waste_basket'][zoom >= 19]::amenity {
marker-file: url('symbols/waste_basket.10.svg');
- marker-fill: #744a08;
+ marker-fill: @amenity-brown;
marker-placement: interior;
}
}
@@ -1062,6 +1065,9 @@
[feature = 'amenity_bar']{
text-dy: 13;
}
+ [feature = 'amenity_nightclub']{
+ text-dy: 12;
+ }
}
}
@@ -1137,7 +1143,6 @@
[feature = 'amenity_community_centre'][zoom >= 17],
[feature = 'amenity_fire_station'][zoom >= 17],
[feature = 'amenity_drinking_water'][zoom >= 17],
- [feature = 'amenity_recyling'][zoom >= 17],
[feature = 'tourism_picnic_site'][zoom >= 17],
[feature = 'leisure_picnic_table'][zoom >= 17],
[feature = 'amenity_post_office'][zoom >= 17] {
@@ -1363,7 +1368,6 @@
[feature = 'leisure_park'][is_building = 'no'],
[feature = 'leisure_recreation_ground'][is_building = 'no'],
[feature = 'landuse_recreation_ground'][is_building = 'no'],
- [feature = 'landuse_conservation'][is_building = 'no'],
[feature = 'landuse_village_green'][is_building = 'no'],
[feature = 'leisure_common'][is_building = 'no'],
[feature = 'leisure_garden'][is_building = 'no'] {
@@ -1846,7 +1850,7 @@
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-fill: #660033;
text-face-name: @book-fonts;
- text-halo-radius: 2;
+ text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
@@ -1879,10 +1883,10 @@
[feature = 'man_made_lighthouse'][zoom >= 15] {
text-name: "[name]";
text-size: 9;
- text-fill: #6699cc;
+ text-fill: @transportation-text;
text-dy: 16;
text-face-name: @book-fonts;
- text-halo-radius: 2;
+ text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @standard-wrap-width;
text-placement: interior;
@@ -1908,7 +1912,7 @@
text-size: 8;
text-dy: 10;
text-face-name: @book-fonts;
- text-halo-radius: 2;
+ text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @standard-wrap-width;
text-placement: interior;
@@ -1990,7 +1994,7 @@
text-name: "[name]";
text-size: 10;
text-dy: 12;
- text-fill: #939;
+ text-fill: @shop-text;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255, 255, 255, 0.6);
@@ -2005,7 +2009,7 @@
text-name: "[name]";
text-size: 10;
text-dy: 12;
- text-fill: #939;
+ text-fill: @shop-text;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255, 255, 255, 0.6);
diff --git a/landcover.mss b/landcover.mss
index 4b8fcfd..326af67 100644
--- a/landcover.mss
+++ b/landcover.mss
@@ -1,6 +1,6 @@
// --- Parks, woods, other green things ---
- at grass: #cdebb0; // also meadow, common, garden, village_green, conservation
+ at grass: #cdebb0; // also meadow, common, garden, village_green
@golf_course: #b5e3b5;
@scrub: #b5e3b5;
@forest: #add19e; // Lch(80,30,135)
@@ -280,7 +280,6 @@
[feature = 'natural_grassland'],
[feature = 'landuse_grass'],
[feature = 'landuse_recreation_ground'],
- [feature = 'landuse_conservation'],
[feature = 'landuse_village_green'],
[feature = 'leisure_common'],
[feature = 'leisure_garden'] {
diff --git a/power.mss b/power.mss
index 81bf18f..249a0f0 100644
--- a/power.mss
+++ b/power.mss
@@ -1,8 +1,16 @@
+ at power-line-color: #888;
+
#power-line {
[zoom >= 14] {
- line-width: 1;
- line-color: #777;
+ line-width: 0.8;
+ line-color: @power-line-color;
+ [zoom >= 15] {
+ line-width: 0.9;
+ }
[zoom >= 16] {
+ line-width: 1.3;
+ }
+ [zoom >= 18] {
line-width: 1.5;
}
}
@@ -11,7 +19,7 @@
#power-minorline {
[zoom >= 16] {
line-width: 0.5;
- line-color: #777;
+ line-color: @power-line-color;
}
}
diff --git a/project.mml b/project.mml
index 5392882..38f069f 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, landuse, leisure, military, \"natural\", power, 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', 'hosp [...]
+ "table": "(SELECT\n way, name, religion, way_pixels,\n COALESCE(aeroway, amenity, wetland, landuse, leisure, military, \"natural\", power, 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', 'hosp [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1449,7 +1449,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', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre [...]
+ "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', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sha [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1475,7 +1475,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', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre [...]
+ "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', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sha [...]
"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_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', 'theme_park', 'museum', 'zoo', 'information', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || [...]
+ "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', 'theme_park', 'museum', 'zoo', 'information', 'picnic_site') THEN tourism ELSE NULL END,\n 'amenity_' || [...]
"geometry_field": "way",
"type": "postgis",
"key_field": "",
@@ -1815,7 +1815,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 48e9cec..5c0cd30 100644
--- a/project.yaml
+++ b/project.yaml
@@ -144,7 +144,7 @@ Layer:
way, COALESCE(name, '') AS name,
('aeroway_' || (CASE WHEN aeroway IN ('apron', 'aerodrome') THEN aeroway ELSE NULL END)) AS aeroway,
('amenity_' || (CASE WHEN amenity IN ('parking', 'bicycle_parking', 'motorcycle_parking', 'university', 'college', 'school', 'hospital', 'kindergarten', 'grave_yard', 'prison', 'place_of_worship', 'clinic') THEN amenity ELSE NULL END)) AS amenity,
- ('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'recreation_ground', 'conservation', 'village_green', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction') THEN landuse ELSE NULL END)) AS landuse,
+ ('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'recreation_ground', 'village_green', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction') THEN landuse ELSE NULL END)) AS landuse,
('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'recreation_ground', 'common', 'garden', '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",
@@ -1615,7 +1615,7 @@ Layer:
COALESCE(
'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,
- 'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'de [...]
+ 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 'clinic', 'community_centre', 'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 'library', 'courthouse', 'townhall', 'parking', 'bicycle_parking', 'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship', 'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court [...]
'shop_' || CASE WHEN shop IN ('supermarket', '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', 'o [...]
'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table') THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill') THEN man_made ELSE NULL END,
@@ -1661,7 +1661,7 @@ Layer:
COALESCE(
'aeroway_' || CASE WHEN aeroway IN ('helipad', 'aerodrome') THEN aeroway ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'guest_house', 'hostel', 'hotel', 'motel', 'information', 'museum', 'picnic_site') THEN tourism ELSE NULL END,
- 'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'de [...]
+ 'amenity_' || CASE WHEN amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 'clinic', 'community_centre', 'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 'library', 'courthouse', 'townhall', 'parking', 'bicycle_parking', 'motorcycle_parking', 'pharmacy', 'doctors', 'dentist', 'place_of_worship', 'police', 'post_box', 'post_office', 'pub', 'biergarten', 'recycling', 'restaurant', 'food_court [...]
'shop_' || CASE WHEN shop IN ('supermarket', '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', 'o [...]
'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,
@@ -1944,7 +1944,7 @@ Layer:
'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'de [...]
'shop_' || CASE WHEN shop IN ('supermarket', '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', 'o [...]
'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 'track', 'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 'picnic_table') THEN leisure ELSE NULL END,
- 'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'conservation', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction', 'military') THEN landuse ELSE NULL END,
+ 'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', '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,
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
@@ -1966,10 +1966,10 @@ Layer:
-- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
WHERE (aeroway IN ('gate', 'apron', 'helipad', 'aerodrome')
OR tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'attraction', 'zoo', 'information', 'picnic_site')
- OR amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 'clinic', 'community_centre', 'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 'library', 'courthouse', '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', 'tele [...]
+ OR amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'dentist', 'atm', 'bicyc [...]
OR shop IS NOT NULL -- skip checking a huge list and use a null check
OR leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 'track', 'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 'picnic_table')
- OR landuse IN ('reservoir', 'basin', 'recreation_ground', 'conservation', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction', 'military')
+ OR landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction', 'military')
OR man_made IN ('lighthouse', 'windmill', 'mast', 'water_tower', 'pier', 'breakwater', 'groyne')
OR "natural" IN ('wood', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier')
OR place IN ('island', 'islet')
@@ -2050,7 +2050,7 @@ Layer:
'amenity_' || CASE WHEN amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', [...]
'shop_' || CASE WHEN shop IN ('supermarket', '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' [...]
'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 'track', 'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 'slipway', 'picnic_table') THEN leisure ELSE NULL END,
- 'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'conservation', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction', 'military') THEN landuse ELSE NULL END,
+ 'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction', 'military') THEN landuse ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('lighthouse', 'windmill', 'mast', 'water_tower') THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'peak', 'volcano', 'saddle', 'cave_entrance', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree') THEN "natural" ELSE NULL END,
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
@@ -2081,10 +2081,10 @@ Layer:
-- The upcoming where clause is needed for performance only, as the CASE statements would end up doing the equivalent filtering
WHERE (aeroway IN ('gate', 'apron', 'helipad', 'aerodrome')
OR tourism IN ('alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'guest_house', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'attraction', 'zoo', 'information', 'viewpoint', 'picnic_site')
- OR amenity IN ('shelter', 'atm', 'bank', 'bar', 'bicycle_rental', 'bus_station', 'cafe', 'car_rental', 'car_sharing', 'cinema', 'clinic', 'community_centre', 'fire_station', 'fuel', 'hospital', 'ice_cream', 'embassy', 'library', 'courthouse', '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', ' [...]
+ OR amenity IN ('pub', 'restaurant', 'food_court', 'cafe', 'fast_food', 'biergarten', 'bar', 'library', 'theatre', 'courthouse', 'townhall', 'cinema', 'clinic', 'community_centre', 'parking', 'bicycle_parking', 'motorcycle_parking', 'police', 'fire_station', 'place_of_worship', 'grave_yard', 'shelter', 'bank', 'embassy', 'fuel', 'bus_station', 'prison', 'university', 'school', 'college', 'kindergarten', 'hospital', 'ice_cream', 'pharmacy', 'doctors', 'dentist', 'atm', 'b [...]
OR shop IS NOT NULL -- skip checking a huge list and use a null check
OR leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'sports_centre', 'stadium', 'track', 'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 'slipway', 'picnic_table')
- OR landuse IN ('reservoir', 'basin', 'recreation_ground', 'conservation', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction', 'military')
+ OR landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farm', 'farmland', 'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill', 'construction', 'military')
OR man_made IN ('lighthouse', 'windmill', 'mast', 'water_tower')
OR "natural" IN ('wood', 'peak', 'volcano', 'saddle', 'cave_entrance', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree')
OR place IN ('island', 'islet')
diff --git a/scripts/shop_values.rb b/scripts/shop_values.rb
index 9ab04a7..596b76b 100755
--- a/scripts/shop_values.rb
+++ b/scripts/shop_values.rb
@@ -15,7 +15,8 @@ EXCEPTIONS = [
"FIXME",
"FixMe",
"other",
- "*"
+ "*",
+ "winery", #see discussion in https://github.com/gravitystorm/openstreetmap-carto/pull/1632
]
diff --git a/symbols/ford.16.svg b/symbols/ford.16.svg
new file mode 100644
index 0000000..d86d5bb
--- /dev/null
+++ b/symbols/ford.16.svg
@@ -0,0 +1,14 @@
+<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" version="1.1" width="100%" height="100%" viewBox="0 0 16 16" id="svg2">
+ <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/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs id="defs6"/>
+ <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+ <path d="M 4.5,1 1,4 l 3.5,3 0,-2 5,0 0,2 3.5,-3 -3.5,-3 0,2 -5,0 z M 3,7.5 c -0.5338983,0 -1.4922852,1 -2,1 L 1,10 c 0.5371839,0 1.5254237,-1 2,-1 0.5042373,0 1.4661017,1 2,1 0.4755023,0 1.4922852,-1 2,-1 0.5042373,0 1.5217305,1 2,1 0.5042373,0 1.525424,-1 2,-1 0.474576,0 1.495763,1 2,1 l 0,-1.5 c -0.415254,0 -1.466102,-1.029661 -2,-1 -0.47827,0 -1.4652784,1 -2,1 -0.4449153,0 -1.4957627,-1 -2,-1 -0.5042373,0 -1.5540971,1 -2,1 -0.4755023,0 -1.4661017,-1 -2,-1 z m 0,3 c -0.5338983,0 -1. [...]
+</svg>
diff --git a/symbols/generating_patterns/bare_ground.md b/symbols/generating_patterns/bare_ground.md
new file mode 100644
index 0000000..b30fe20
--- /dev/null
+++ b/symbols/generating_patterns/bare_ground.md
@@ -0,0 +1,8 @@
+
+The bare ground patterns are rasterized and colored versions of the provided SVGs
+
+```
+convert -depth 8 -density 90 pattern.svg pattern.png
+
+convert -depth 8 -size 256x256 xc:"$SYMBOL" \( pattern.png -negate \) -set colorspace RGB -alpha Off -compose CopyOpacity -composite -set colorspace sRGB +gamma - pattern_overlay.png
+```
diff --git a/symbols/generating_patterns/bog.svg b/symbols/generating_patterns/bog.svg
new file mode 100644
index 0000000..d64e20e
--- /dev/null
+++ b/symbols/generating_patterns/bog.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Svg" width="512" height="512">
+ <defs>
+ <clipPath id="clipPath">
+
+ <rect x="0" y="0" width="512" height="512"/></clipPath>
+ <g transform="matrix(1,0,0,1,-5,-11)" id="Si5y5ofczi60"><g><path d="m 2.5,14.75 8,0 0,0.75 -8,0 z M 2.5,7 c -0.125,0 0,0.5 0.25,1.75 0.25,1.75 0.25,1.5 0,3.25 0.5,0 1,-0.25 1.5,-0.25 C 4.25,10.25 4,10 3.5,8.25 3.25,7.25 2.625,7 2.5,7 z m 4.25,0.75 c -0.25,0 -0.5,0 -1,0.5 -0.75,1 -0.75,1.5 -1,3.5 0.5,0 1,0.25 1.5,0.25 -0.005,-1.6198 0,-3 0.5,-4.25 z M 0.25,9.5 c 0,0.25 0.25,0.5 0.5,1 C 0.98629,11.2 0.97479,10.49 1,12.25 1.75,12 2,12 2.25,12 2.25,10.75 1.75,10.25 1.25,9.75 0.75,9.5 0.7 [...]
+ <g style="clip-path: url(#clipPath);" id="Pattern">
+ <use a0:href="#Si5y5ofczi60" xmlns:a0="http://www.w3.org/1999/xlink" x="15" y="23"/><use a1:href="#Si5y5ofczi60" xmlns:a1="http://www.w3.org/1999/xlink" x="527" y="23"/><use a2:href="#Si5y5ofczi60" xmlns:a2="http://www.w3.org/1999/xlink" x="527" y="535"/><use a3:href="#Si5y5ofczi60" xmlns:a3="http://www.w3.org/1999/xlink" x="15" y="535"/><use a4:href="#Si5y5ofczi60" xmlns:a4="http://www.w3.org/1999/xlink" x="527" y="535"/><use a5:href="#Si5y5ofczi60" xmlns:a5="http://www.w3.org/1999/ [...]
+ <desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/generating_patterns/forest.md b/symbols/generating_patterns/forest.md
new file mode 100644
index 0000000..694207c
--- /dev/null
+++ b/symbols/generating_patterns/forest.md
@@ -0,0 +1,11 @@
+Pattern file for forests is generated in two steps.
+
+In the first step visit [jsdotpattern (command sequence is recorded)](http://www.imagico.de/map/jsdotpattern.php#x,512,jdp6894;g,30,32,32;s,jdp33742;s,jdp81637;rx,250,2,32,32;s,jdp28824;s,jdp59702;s,jdp91550;s,jdp27774;rx,250,2,64,64;rd,1,0,0,tree%20pair,1,5,5,0,jdp52898,6b8d5e,add19e;)
+
+Generate file - use "render (px aligned)" followed by using "get pattern SVG data" (it is expected that background will be transparent, background colour in jsdotpattern is only for display).
+
+Generated SVG image is present in this folder (forest.svg).
+
+Due to limitations of Mapnik it is impossible to use this svg file.
+
+Currently used workaround is to export png file (this image is used in rendering).
\ No newline at end of file
diff --git a/symbols/generating_patterns/forest.svg b/symbols/generating_patterns/forest.svg
new file mode 100644
index 0000000..3300560
--- /dev/null
+++ b/symbols/generating_patterns/forest.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Svg" width="512" height="512">
+ <defs>
+ <clipPath id="clipPath">
+
+ <rect x="0" y="0" width="512" height="512"/></clipPath>
+ <g transform="matrix(1,0,0,1,-5,-5)" id="gSidonz1q1ha"><g><path d="M 2,0 0,6 0,7 2,7 2,10 3,10 3,7 5,7 5,6 3,0 z M 2.5,1 4,6 1,6 z" fill="rgb(107,141,94)"/><path d="m 7,5 1,0 0,5 -1,0 z" fill="rgb(107,141,94)"/><path d="m 7.5,0 a 2.5,3 0 0 1 0,6 l 0,-1 a 1.5,2 0 0 0 0,-4 1.5,2 0 1 0 0,4 l 0,1 a 2.5,3 0 1 1 0,-6 z" fill="rgb(107,141,94)"/></g>
+</g><g transform="matrix(1,0,0,1,-5,-5)" id="gSidonz1q1hb"><g><path d="m 2,5 1,0 0,5 -1,0 z" fill="rgb(107,141,94)"/><path d="m 2.5,0 a 2.5,3 0 0 1 0,6 l 0,-1 a 1.5,2 0 0 0 0,-4 1.5,2 0 1 0 0,4 l 0,1 a 2.5,3 0 1 1 0,-6 z" fill="rgb(107,141,94)"/><path d="M 7,0 5,6 5,7 7,7 7,10 8,10 8,7 10,7 10,6 8,0 z M 7.5,1 9,6 6,6 z" fill="rgb(107,141,94)"/></g>
+</g></defs>
+ <g style="clip-path: url(#clipPath);" id="Pattern">
+ <use a0:href="#gSidonz1q1ha" xmlns:a0="http://www.w3.org/1999/xlink" x="73" y="180"/><use a1:href="#gSidonz1q1ha" xmlns:a1="http://www.w3.org/1999/xlink" x="312" y="201"/><use a2:href="#gSidonz1q1hb" xmlns:a2="http://www.w3.org/1999/xlink" x="326" y="181"/><use a3:href="#gSidonz1q1hb" xmlns:a3="http://www.w3.org/1999/xlink" x="408" y="435"/><use a4:href="#gSidonz1q1hb" xmlns:a4="http://www.w3.org/1999/xlink" x="114" y="30"/><use a5:href="#gSidonz1q1hb" xmlns:a5="http://www.w3.org/199 [...]
+ <desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/generating_patterns/mangrove.svg b/symbols/generating_patterns/mangrove.svg
new file mode 100644
index 0000000..84b3611
--- /dev/null
+++ b/symbols/generating_patterns/mangrove.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Svg" width="512" height="512">
+ <defs>
+ <clipPath id="clipPath">
+
+ <rect x="0" y="0" width="512" height="512"/></clipPath>
+ <g transform="matrix(1,0,0,1,-4,-10)" id="Si5y5ofczasa"><g><path d="M 4,5 C 1.7909,5 0,6.79086 0,9 c 0,1.0247 0.397769,1.9241 1.03125,2.625 l 0.5625,-0.5 C 1.07812,10.5479 0.75,9.7781 0.75,8.75 c 0,-1.7949 1.4551,-3 3.25,-3 1.25,0 2.75,1.4551 2.75,3.25 0,0.8715 -0.25039,1.6242 -0.71875,2.1875 l 0.65625,0.75 C 7.48813,11.2131 8,10.1687 8,9 8,6.79086 6.2091,5 4,5 z M 2.75,10.5 C 2.5,12.75 2,13.75 1.25,15 L 0,15 c 1.5,-1.5 2.25,-3.25 2.75,-4.5 z m 1.25,0 c 0,2.25 0.5,3.75 0,5 l -1.25,0 [...]
+ <g style="clip-path: url(#clipPath);" id="Pattern">
+ <use a0:href="#Si5y5ofczasa" xmlns:a0="http://www.w3.org/1999/xlink" x="15" y="23"/><use a1:href="#Si5y5ofczasa" xmlns:a1="http://www.w3.org/1999/xlink" x="527" y="23"/><use a2:href="#Si5y5ofczasa" xmlns:a2="http://www.w3.org/1999/xlink" x="527" y="535"/><use a3:href="#Si5y5ofczasa" xmlns:a3="http://www.w3.org/1999/xlink" x="15" y="535"/><use a4:href="#Si5y5ofczasa" xmlns:a4="http://www.w3.org/1999/xlink" x="527" y="535"/><use a5:href="#Si5y5ofczasa" xmlns:a5="http://www.w3.org/1999/ [...]
+ <desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/generating_patterns/marsh.svg b/symbols/generating_patterns/marsh.svg
new file mode 100644
index 0000000..d53f99a
--- /dev/null
+++ b/symbols/generating_patterns/marsh.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Svg" width="512" height="512">
+ <defs>
+ <clipPath id="clipPath">
+
+ <rect x="0" y="0" width="512" height="512"/></clipPath>
+ <g transform="matrix(1,0,0,1,-4,-11)" id="Si5y5ofczdv2"><g><path d="M 8.75,9.75 C 8.75,10 8.5,11 8.25,12.25 8,13.5 8,14 8.25,15.5 8,15.5 7.3838,15.33 7,15.25 c 0.5,-0.5 -0.25,-1.5 0.75,-4 0.25,-0.75 0.25,-1 1,-1.5 z m -8.5,0.75 c 0,0.25 0.25,0.5 0.5,1.25 C 1,13.75 0.97479,13.74 1,15.5 1.5,15.25 1.8662,15.33 2.25,15.25 2.25,14 2.25,12 1,11 0.75,10.75 0.75,10.75 0.25,10.5 z M 6.5,8.75 C 6.25,8.75 6,9 5.75,9.5 5,11.5 5.25,13.75 5,15 c 0.5,0 1,0.25 1.5,0.25 -0.5,-1 -0.25,-1.5 -0.25,-4.75 [...]
+ <g style="clip-path: url(#clipPath);" id="Pattern">
+ <use a0:href="#Si5y5ofczdv2" xmlns:a0="http://www.w3.org/1999/xlink" x="15" y="23"/><use a1:href="#Si5y5ofczdv2" xmlns:a1="http://www.w3.org/1999/xlink" x="527" y="23"/><use a2:href="#Si5y5ofczdv2" xmlns:a2="http://www.w3.org/1999/xlink" x="527" y="535"/><use a3:href="#Si5y5ofczdv2" xmlns:a3="http://www.w3.org/1999/xlink" x="15" y="535"/><use a4:href="#Si5y5ofczdv2" xmlns:a4="http://www.w3.org/1999/xlink" x="527" y="535"/><use a5:href="#Si5y5ofczdv2" xmlns:a5="http://www.w3.org/1999/ [...]
+ <desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/generating_patterns/reed.svg b/symbols/generating_patterns/reed.svg
new file mode 100644
index 0000000..a29e2a6
--- /dev/null
+++ b/symbols/generating_patterns/reed.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Svg" width="512" height="512">
+ <defs>
+ <clipPath id="clipPath">
+
+ <rect x="0" y="0" width="512" height="512"/></clipPath>
+ <g transform="matrix(1,0,0,1,-4,-11)" id="Si5y5ofczdv2"><g><path d="m 2.5,4 c -0.25,0 -0.75,0.75 -1,1.25 0,0.5 0.77771,1.66657 1,2 C 2.62087,7.55218 2.69913,7.82882 2.75,8.09375 2.61263,7.95866 2.45312,7.85156 2.25,7.75 c 0,0.75 0.25,1 0.5,2.25 0,1 0.75,3.75 0,5.25 0.5,0 1,-0.25 1.5,-0.25 C 4.5,12.5 4,11 3.25,9 3.1875,8.8125 3.12891,8.66406 3.0625,8.53125 3.05547,8.51719 3.03837,8.51355 3.03125,8.5 2.9874,8.08839 2.93039,7.63135 2.75,7 2.61652,6.4661 3.5,5.5 3.5,5 3.25,4.5 2.75,4 2.5 [...]
+ <g style="clip-path: url(#clipPath);" id="Pattern">
+ <use a0:href="#Si5y5ofczdv2" xmlns:a0="http://www.w3.org/1999/xlink" x="15" y="23"/><use a1:href="#Si5y5ofczdv2" xmlns:a1="http://www.w3.org/1999/xlink" x="527" y="23"/><use a2:href="#Si5y5ofczdv2" xmlns:a2="http://www.w3.org/1999/xlink" x="527" y="535"/><use a3:href="#Si5y5ofczdv2" xmlns:a3="http://www.w3.org/1999/xlink" x="15" y="535"/><use a4:href="#Si5y5ofczdv2" xmlns:a4="http://www.w3.org/1999/xlink" x="527" y="535"/><use a5:href="#Si5y5ofczdv2" xmlns:a5="http://www.w3.org/1999/ [...]
+ <desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/generating_patterns/rock.svg b/symbols/generating_patterns/rock.svg
new file mode 100644
index 0000000..5ed9c29
--- /dev/null
+++ b/symbols/generating_patterns/rock.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="256" width="256" id="Svg">
+ <defs>
+ <clipPath id="clipPath">
+ <rect height="256" width="256" y="0" x="0"/>
+ </clipPath>
+ <g transform="matrix(0.3,0,0,0.3,-7.2879,-7.2)" id="Si4sfa15ndl4"><g transform="translate(0.000000,48.000000) scale(0.100000,-0.100000)"><path d="M230 430 c0 -21 -33 -29 -45 -10 -3 6 -18 10 -32 10 -21 0 -23 -2 -13 -15 13 -16 11 -18 -43 -30 -16 -3 -40 -17 -53 -30 -21 -21 -22 -27 -12 -50 13 -30 28 -33 28 -6 0 31 47 61 96 61 44 0 67 -16 43 -31 -8 -4 -24 -6 -37 -2 -25 6 -92 -39 -92 -63 0 -22 25 -17 59 12 17 14 36 24 43 23 42 -5 70 2 75 21 6 24 26 26 44 4 11 -14 11 -18 -4 -28 -12 -9 -13 - [...]
+ <g style="clip-path: url(#clipPath);" id="Pattern">
+ <use a0:href="#Si4sfa15ndrt" xmlns:a0="http://www.w3.org/1999/xlink" x="7.936303518969185" y="5.844108248237993"/><use a1:href="#Si4sfa15ndrs" xmlns:a1="http://www.w3.org/1999/xlink" x="7.936303518969185" y="5.844108248237993"/><use a2:href="#Si4sfa15ndrt" xmlns:a2="http://www.w3.org/1999/xlink" x="263.93630351896917" y="5.844108248237993"/><use a3:href="#Si4sfa15ndrs" xmlns:a3="http://www.w3.org/1999/xlink" x="263.93630351896917" y="5.844108248237993"/><use a4:href="#Si4sfa15ndrt" x [...]
+ <desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/generating_patterns/rock_overlay at 2x.png b/symbols/generating_patterns/rock_overlay at 2x.png
new file mode 100644
index 0000000..bd2bfb7
Binary files /dev/null and b/symbols/generating_patterns/rock_overlay at 2x.png differ
diff --git a/symbols/generating_patterns/scree.svg b/symbols/generating_patterns/scree.svg
new file mode 100644
index 0000000..d472de1
--- /dev/null
+++ b/symbols/generating_patterns/scree.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="256" width="256" id="Svg">
+ <defs>
+ <clipPath id="clipPath">
+ <rect height="256" width="256" y="0" x="0"/>
+ </clipPath>
+ <g transform="matrix(0.125,0,0,0.125,-0.6094,-1.2188)" id="Si1m19h4dqnj"><g><path d="m 9,6.75 0.5,5.75 -5.75,1.75 -3.5,-4.25 3,-4.75 z"/></g></g><g transform="matrix(0.125,0,0,0.125,-0.6094,-1.2188)" id="Si1m19h4dqnk"><g><path d="m 8.75,6.0022 1.75,5.25 -3.5,4.75 -5.75,-1.75 -1,-5 3,-3.75 z"/></g></g><g transform="matrix(0.125,0,0,0.125,-0.6094,-1.2188)" id="Si1m19h4dqnl"><g><path d="m 8.5,8.0022 0.25,4.25 -2.5,2 -3.5,0.25 -2.5,-3.25 1.75,-3.75 3,-1 z"/></g></g><g transform="matrix(0 [...]
+ <g style="clip-path: url(#clipPath);" id="Pattern">
+ <use a0:href="#Si1m19h4dqno" xmlns:a0="http://www.w3.org/1999/xlink" x="3.0998552888030386" y="0.8392090029889325"/><use a1:href="#Si1m19h4dqno" xmlns:a1="http://www.w3.org/1999/xlink" x="259.09985528880304" y="0.8392090029889325"/><use a2:href="#Si1m19h4dqno" xmlns:a2="http://www.w3.org/1999/xlink" x="259.09985528880304" y="256.8392090029889"/><use a3:href="#Si1m19h4dqno" xmlns:a3="http://www.w3.org/1999/xlink" x="3.0998552888030386" y="256.8392090029889"/><use a4:href="#Si1m19h4dqn [...]
+ <desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/generating_patterns/scree_overlay at 2x.png b/symbols/generating_patterns/scree_overlay at 2x.png
new file mode 100644
index 0000000..e2a6deb
Binary files /dev/null and b/symbols/generating_patterns/scree_overlay at 2x.png differ
diff --git a/symbols/generating_patterns/swamp.svg b/symbols/generating_patterns/swamp.svg
new file mode 100644
index 0000000..9a8af90
--- /dev/null
+++ b/symbols/generating_patterns/swamp.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Svg" width="512" height="512">
+ <defs>
+ <clipPath id="clipPath">
+
+ <rect x="0" y="0" width="512" height="512"/></clipPath>
+ <g transform="matrix(1,0,0,1,-4,-11)" id="Si5y5ofczc0k"><g><path d="m 4,6 c -2.2091,0 -4,1.79086 -4,4 0,1.4941 0.817455,2.7819 2.03125,3.4688 l 0.375,-0.6563 C 1.42585,12.2529 0.75,11.25 0.75,9.75 c 0,-1.7949 1.4551,-3 3.25,-3 1.25,0 2.75,1.4551 2.75,3.25 0,1.2075 -0.44269,2.1897 -1.34375,2.75 l 0.375,0.8125 C 7.09491,12.9068 8,11.568 8,10 8,7.79086 6.2091,6 4,6 z m 0,5.5 c 0,2.75 0.25,3.75 1.5,4.5 l -3,0 C 3,15.75 3,13 3,11.5 z"/></g></g></defs>
+ <g style="clip-path: url(#clipPath);" id="Pattern">
+ <use a0:href="#Si5y5ofczc0k" xmlns:a0="http://www.w3.org/1999/xlink" x="15" y="23"/><use a1:href="#Si5y5ofczc0k" xmlns:a1="http://www.w3.org/1999/xlink" x="527" y="23"/><use a2:href="#Si5y5ofczc0k" xmlns:a2="http://www.w3.org/1999/xlink" x="527" y="535"/><use a3:href="#Si5y5ofczc0k" xmlns:a3="http://www.w3.org/1999/xlink" x="15" y="535"/><use a4:href="#Si5y5ofczc0k" xmlns:a4="http://www.w3.org/1999/xlink" x="527" y="535"/><use a5:href="#Si5y5ofczc0k" xmlns:a5="http://www.w3.org/1999/ [...]
+ <desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/generating_patterns/wetland.md b/symbols/generating_patterns/wetland.md
new file mode 100644
index 0000000..96c59a0
--- /dev/null
+++ b/symbols/generating_patterns/wetland.md
@@ -0,0 +1,16 @@
+
+Wetland patterns are built from two separately generated pattern files by means of raster processing. The basic principle is shown by the following ImageMagick commands:
+
+```
+convert -density 720 pattern.svg -morphology Erode Disk:5.3 \( +clone -fill black -draw 'color 0,0 floodfill' -negate \) +swap -morphology Erode Disk:10.3 -compose Darken -composite -scale 12.5% -depth 8 pattern_casing.png
+
+convert -depth 8 -density 90 wetland.svg wetland_tile.png
+
+montage wetland_tile.png wetland_tile.png wetland_tile.png wetland_tile.png -geometry 256x256+0+0 wetland_512.png
+
+convert wetland_512.png \( pattern_casing.png -negate \) -compose Lighten -composite -threshold 50% \( +clone -negate -morphology hitandmiss peaks:1.9 \) -compose Lighten -composite +level 20%,100% wetland_pattern_bkg.png
+
+convert -depth 8 -size 512x512 xc:"$SYMBOL" \( pattern.png -negate \) -set colorspace RGB -alpha Off -compose CopyOpacity -composite pattern_col.png
+
+convert -depth 8 -size 512x512 xc:"$WETLAND" \( wetland_pattern_bkg.png -negate \) -set colorspace RGB -alpha Off -compose CopyOpacity -composite +compose pattern_col.png -compose Over -composite wetland_pattern.png
+```
diff --git a/symbols/generating_patterns/wetland.svg b/symbols/generating_patterns/wetland.svg
new file mode 100644
index 0000000..9ce3e6d
--- /dev/null
+++ b/symbols/generating_patterns/wetland.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="256" width="256" id="Svg">
+ <defs>
+ <clipPath id="clipPath">
+ <rect height="256" width="256" y="0" x="0"/>
+ </clipPath>
+ <g transform="matrix(0.5,0,0,0.5,-4,-4)" id="Si4u9iym5vq7"><g><path d="m 1,7 14,0 c 0,0 0,0 0,0 l 0,2 c 0,0 0,0 0,0 l -14,0 c 0,0 0,0 0,0 l 0,-2 c 0,0 0,0 0,0 z"/></g></g></defs>
+ <g style="clip-path: url(#clipPath);" id="Pattern">
+ <use a0:href="#Si4u9iym5vq7" xmlns:a0="http://www.w3.org/1999/xlink" x="11.5" y="5.5"/><use a1:href="#Si4u9iym5vq7" xmlns:a1="http://www.w3.org/1999/xlink" x="267.5" y="5.5"/><use a2:href="#Si4u9iym5vq7" xmlns:a2="http://www.w3.org/1999/xlink" x="267.5" y="261.5"/><use a3:href="#Si4u9iym5vq7" xmlns:a3="http://www.w3.org/1999/xlink" x="11.5" y="261.5"/><use a4:href="#Si4u9iym5vq7" xmlns:a4="http://www.w3.org/1999/xlink" x="267.5" y="261.5"/><use a5:href="#Si4u9iym5vq7" xmlns:a5="http: [...]
+ <desc>Created with Snap</desc></svg>
\ No newline at end of file
diff --git a/symbols/generating_patterns/wetland_bog at 2x.png b/symbols/generating_patterns/wetland_bog at 2x.png
new file mode 100644
index 0000000..c6cc2d5
Binary files /dev/null and b/symbols/generating_patterns/wetland_bog at 2x.png differ
diff --git a/symbols/generating_patterns/wetland_generic at 2x.png b/symbols/generating_patterns/wetland_generic at 2x.png
new file mode 100644
index 0000000..790911a
Binary files /dev/null and b/symbols/generating_patterns/wetland_generic at 2x.png differ
diff --git a/symbols/generating_patterns/wetland_mangrove at 2x.png b/symbols/generating_patterns/wetland_mangrove at 2x.png
new file mode 100644
index 0000000..f741b9a
Binary files /dev/null and b/symbols/generating_patterns/wetland_mangrove at 2x.png differ
diff --git a/symbols/generating_patterns/wetland_marsh at 2x.png b/symbols/generating_patterns/wetland_marsh at 2x.png
new file mode 100644
index 0000000..372765c
Binary files /dev/null and b/symbols/generating_patterns/wetland_marsh at 2x.png differ
diff --git a/symbols/generating_patterns/wetland_reed at 2x.png b/symbols/generating_patterns/wetland_reed at 2x.png
new file mode 100644
index 0000000..23cc5b2
Binary files /dev/null and b/symbols/generating_patterns/wetland_reed at 2x.png differ
diff --git a/symbols/generating_patterns/wetland_swamp at 2x.png b/symbols/generating_patterns/wetland_swamp at 2x.png
new file mode 100644
index 0000000..c75f1c6
Binary files /dev/null and b/symbols/generating_patterns/wetland_swamp at 2x.png differ
diff --git a/symbols/nightclub.14.svg b/symbols/nightclub.14.svg
new file mode 100644
index 0000000..d785725
--- /dev/null
+++ b/symbols/nightclub.14.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+ version="1.1"
+ width="100%"
+ height="100%"
+ viewBox="0 0 14 14"
+ id="svg2">
+ <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
+ width="14"
+ height="14"
+ x="0"
+ y="0"
+ id="canvas"
+ style="fill:none;stroke:none;visibility:hidden" />
+ <path
+ d="M 13.006803,0.00308957 3.0068028,2.0030896 l 0,8.5624994 c -0.385369,-0.06933 -0.787572,-0.07549 -1.1875,0.03125 -1.15478198,0.308194 -2.01331698,1.387352 -1.78124998,2.25 0.232067,0.862648 1.50146898,1.370694 2.65624998,1.0625 1.154781,-0.308194 1.8125,-1.336236 1.8125,-2.25 l 0,-6.9687494 7.0000002,-1.375 0,5.6249997 c -0.385334,-0.06124 -0.787622,-0.04422 -1.1875,0.0625 -1.1546372,0.308156 -2.0130612,1.3561497 -1.7812502,2.2187497 0.232265,0.862479 1.5016132,1.370655 2.6562502 [...]
+ id="nightclub"
+ style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+</svg>
diff --git a/symbols/nightclub.18.svg b/symbols/nightclub.18.svg
deleted file mode 100644
index fd56311..0000000
--- a/symbols/nightclub.18.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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"
- version="1.1"
- width="100%"
- height="100%"
- viewBox="0 0 18 18"
- id="svg2">
- <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
- width="18"
- height="18"
- x="0"
- y="0"
- id="canvas"
- style="fill:none;stroke:none;visibility:hidden" />
- <g
- id="nightclub">
- <path
- d="m 15.006803,2.0030893 -10.0000002,2 0,8.5624997 c -0.385369,-0.06933 -0.7875721,-0.07549 -1.1875,0.03125 -1.1547814,0.308194 -2.0133171,1.387352 -1.78125,2.25 0.2320671,0.862648 1.5014687,1.370694 2.65625,1.0625 1.1547814,-0.308194 1.8125,-1.336236 1.8125,-2.25 l 0,-6.9687497 7.0000002,-1.375 0,5.6249997 c -0.385334,-0.06124 -0.787622,-0.04422 -1.1875,0.0625 -1.154637,0.308156 -2.013061,1.35615 -1.78125,2.21875 0.232265,0.862479 1.501613,1.370655 2.65625,1.0625 1.154637,-0.3081 [...]
- id="halo"
- style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- <path
- d="m 15.006803,2.0030893 -10,2 0,8.5624997 c -0.385369,-0.06933 -0.787572,-0.07549 -1.1875,0.03125 -1.154782,0.308194 -2.013317,1.387352 -1.78125,2.25 0.232067,0.862648 1.501469,1.370694 2.65625,1.0625 1.154781,-0.308194 1.8125,-1.336236 1.8125,-2.25 l 0,-6.9687497 7,-1.375 0,5.6249997 c -0.385334,-0.06124 -0.787622,-0.04422 -1.1875,0.0625 -1.154637,0.308156 -2.013061,1.35615 -1.78125,2.21875 0.232265,0.862479 1.501613,1.370655 2.65625,1.0625 1.154637,-0.308156 1.8125,-1.28125 1.8 [...]
- id="icon"
- style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none" />
- </g>
-</svg>
diff --git a/symbols/rock_overlay.png b/symbols/rock_overlay.png
index 896e78d..4538916 100644
Binary files a/symbols/rock_overlay.png and b/symbols/rock_overlay.png differ
diff --git a/symbols/scree_overlay.png b/symbols/scree_overlay.png
index 718fbb9..8a40b04 100644
Binary files a/symbols/scree_overlay.png and b/symbols/scree_overlay.png differ
diff --git a/symbols/transport_ford.p.16.png b/symbols/transport_ford.p.16.png
deleted file mode 100644
index dc1bfc2..0000000
Binary files a/symbols/transport_ford.p.16.png and /dev/null differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git
More information about the Pkg-grass-devel
mailing list