From 3fd33df1a3654e501b6d7af746f67372e9bf8d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ko=C4=87?= Date: Thu, 10 Aug 2017 00:14:19 +0200 Subject: [PATCH] Changing cemetary symbols and adding muslim --- landcover.mss | 6 +++-- project.mml | 2 +- symbols/grave_yard_christian.png | Bin 161 -> 0 bytes symbols/grave_yard_christian.svg | 38 +++++++++++++++++++++++++++++++ symbols/grave_yard_generic.png | Bin 170 -> 0 bytes symbols/grave_yard_generic.svg | 38 +++++++++++++++++++++++++++++++ symbols/grave_yard_jewish.png | Bin 380 -> 343 bytes symbols/grave_yard_muslim.svg | 38 +++++++++++++++++++++++++++++++ 8 files changed, 119 insertions(+), 3 deletions(-) delete mode 100644 symbols/grave_yard_christian.png create mode 100644 symbols/grave_yard_christian.svg delete mode 100644 symbols/grave_yard_generic.png create mode 100644 symbols/grave_yard_generic.svg create mode 100644 symbols/grave_yard_muslim.svg diff --git a/landcover.mss b/landcover.mss index 379425d41f..b1257fc6a5 100644 --- a/landcover.mss +++ b/landcover.mss @@ -181,10 +181,12 @@ } [zoom >= 14] { [religion = 'jewish'] { polygon-pattern-file: url('symbols/grave_yard_jewish.png'); } - [religion = 'christian'] { polygon-pattern-file: url('symbols/grave_yard_christian.png'); } - [religion = 'INT-generic'] { polygon-pattern-file: url('symbols/grave_yard_generic.png'); } + [religion = 'christian'] { polygon-pattern-file: url('symbols/grave_yard_christian.svg'); } + [religion = 'muslim'] { polygon-pattern-file: url('symbols/grave_yard_muslim.svg'); } + [religion = 'INT-generic'] { polygon-pattern-file: url('symbols/grave_yard_generic.svg'); } [religion = 'jewish'], [religion = 'christian'], + [religion = 'muslim'], [religion = 'INT-generic'] { [way_pixels >= 4] { polygon-pattern-gamma: 0.75; } [way_pixels >= 64] { polygon-pattern-gamma: 0.3; } diff --git a/project.mml b/project.mml index ad3305274b..fd6dfa9c01 100644 --- a/project.mml +++ b/project.mml @@ -145,7 +145,7 @@ Layer: ('tourism_' || (CASE WHEN tourism IN ('attraction', 'camp_site', 'caravan_site', 'picnic_site') THEN tourism ELSE NULL END)) AS tourism, ('highway_' || (CASE WHEN highway IN ('services', 'rest_area') THEN highway ELSE NULL END)) AS highway, ('railway_' || (CASE WHEN railway = 'station' THEN railway ELSE NULL END)) AS railway, - CASE WHEN religion IN ('christian', 'jewish') THEN religion ELSE 'INT-generic'::text END AS religion, + CASE WHEN religion IN ('christian', 'jewish', 'muslim') THEN religion ELSE 'INT-generic'::text END AS religion, way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels FROM planet_osm_polygon WHERE (landuse IS NOT NULL diff --git a/symbols/grave_yard_christian.png b/symbols/grave_yard_christian.png deleted file mode 100644 index 0356f798fb1dbfbd0ede75b236d244300ccd5c50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zK#5x*%;@Un`vEA(UgGKN%6^ZVLqx$i{eOcbP)N_y#WBR^3@buxIm`njxgN@xNApOG?( diff --git a/symbols/grave_yard_christian.svg b/symbols/grave_yard_christian.svg new file mode 100644 index 0000000000..00a6b71cb7 --- /dev/null +++ b/symbols/grave_yard_christian.svg @@ -0,0 +1,38 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/symbols/grave_yard_generic.png b/symbols/grave_yard_generic.png deleted file mode 100644 index 9f5fa55c8d37fe8760723b4d7bda3808b88d528c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zK#7|m%=qGS&Rn1%dx@v7EBife4iOo%lr-KEr|n)(Xet-}e2Nz5V;& zDc84{hdH9i`?KYpKGMu;fa^|0R + + + + + image/svg+xml + + + + + + + + + diff --git a/symbols/grave_yard_jewish.png b/symbols/grave_yard_jewish.png index 0f3315b1e03e2188fe2761ec39ecae80bdb99cd1..20f276f0a010bb19c7a89443cdbcf44d111e7642 100644 GIT binary patch literal 343 zcmV-d0jU0oP)b%O2?ZaMB&oL%Y06o&1QFJ=a&Uz&Ul`U z^l3KIy7q6JTkx5!P_3^(Ii7f1Omv;C0mzFloCpf2mIRFefL7?a>-D9I3%KKnL9Z`a zk>T70d)?zhPdoIKsyK0EMPAwAf41QI@`~jqrW19zzqu8F*ZI3HH!gh zslSYBdx2z^;)95IoANRrD=Ng>gedeRyR_aAju#VM{e&<_#34X=5JDe%1{LPuq=)HH pA3uiw_Ybt2Ed*nXF~%5EpKs;5Rh6=0D+vGq002ovPDHLkV1iZOkct2R delta 361 zcmV-v0ha#P0{j9qiBL{Q4GJ0x0000DNk~Le0000I0000I2nGNE09MY9R{#J224YJ` zL;(K){{a7>y{D6rAs&C;3kVbo6tsoN8vpovUQ|;Ez9Hc6St7zM*4%Gs;#taE4{Sm z`i82JZL>oaMt4JunCn5OF6h451JH&eRxB#8+P!Mx5&$MX!&!ePz19ZSNfR23v2@yz z`HZR0h^iPdG@-?rbI6a@=A#+wGG~!47!JGuEJSo&<}A}C$kk!Xhx(q^H(ftSp*U>F zl9asKP@ih8kB#P4LFzM#!{)lMLk#L&LZ=ZU!nWQcfE7cG9o~6PUC_a&u)lzubuu5% z0EilS*{)Os9wsgKBELERnQt*nhZ6+ogIojwq{&$R`S-s8>$qb+!<6&(00000NkvXX Hu0mjfp$woN diff --git a/symbols/grave_yard_muslim.svg b/symbols/grave_yard_muslim.svg new file mode 100644 index 0000000000..18b10c204d --- /dev/null +++ b/symbols/grave_yard_muslim.svg @@ -0,0 +1,38 @@ + + + + + + image/svg+xml + + + + + + + + +