Merge pull request #100 from tmcw/source-tags

Add source tags to more sources of imagery

diff --git a/CODING.txt b/CODING.txt
index d9c6e3e1883e1eb4812a0e415912ecd6f1554b9d..78ed6b5487b0533d97c1601ffb69f95ca7b2dc31 100644 (file)
--- a/CODING.txt
+++ b/CODING.txt
@@ -41,7 +41,7 @@ package net.systemed.potlatch2.indentation {
 
 == Icons ==
 
-* POI icons for map_features are 24x24 and come from the CC0-licensed SJJB set (http://www.sjjb.co.uk/icons)
+* POI icons for map_features are 24x24 and come from the CC0-licensed SJJB set (http://www.sjjb.co.uk/mapicons)
 * POI icons for Halcyon stylesheets are 16x16 and also come from the SJJB set
 * Way icons for map_features are 75x45 and have up to now generally been drawn by Richard (see way_icons.ai)
 * All features must have a unique icon, and all icons must be in the correct style. Do not add a feature without a matching icon.

diff --git a/l10n/locale/es_ES/p2_main.properties b/l10n/locale/es_ES/p2_main.properties
index 17d5d5ea5a756ec50f3a81c30f81d0d2199d4c55..fddd886fcac9e147563c307d381229123798a354 100644 (file)
--- a/l10n/locale/es_ES/p2_main.properties
+++ b/l10n/locale/es_ES/p2_main.properties
@@ -1,13 +1,14 @@
 # Messages for Spanish (español)
 # Exported from translatewiki.net
 # Author: Armando-Martin
+# Author: Fitoschido
 
 main.undo=Deshacer
 main.redo=Rehacer
 main.background=Fondo
-main.map_style=Estilo de mapa
-main.gpsButton=Datos GPS
-main.gps_data=Datos GPS
+main.map_style=Estilo del mapa
+main.gpsButton=Datos del GPS
+main.gps_data=Datos del GPS
 main.my_tracks=Mis pistas
 main.clear_gps=Borrar
 main.help=Ayuda

diff --git a/l10n/locale/nb_NO/help_dialog.properties b/l10n/locale/nb_NO/help_dialog.properties
index 893e417db5e0bb685fc8a824e53846298e417891..43e618189d6c2179563f290fd28696d82f26e4dc 100644 (file)
--- a/l10n/locale/nb_NO/help_dialog.properties
+++ b/l10n/locale/nb_NO/help_dialog.properties
@@ -1,4 +1,4 @@
-# Messages for Norwegian Bokmål (norsk (bokmål)‎)
+# Messages for Norwegian Bokmål (norsk bokmål)
 # Exported from translatewiki.net
 # Author: Event
 # Author: Haakon K

diff --git a/l10n/locale/nb_NO/p2_main.properties b/l10n/locale/nb_NO/p2_main.properties
index 2ed18c7c84e8b577538ae9635581ee538b0256ca..c889502864c0ac91adddee4f16b38f01c00b7c84 100644 (file)
--- a/l10n/locale/nb_NO/p2_main.properties
+++ b/l10n/locale/nb_NO/p2_main.properties
@@ -1,4 +1,4 @@
-# Messages for Norwegian Bokmål (norsk (bokmål)‎)
+# Messages for Norwegian Bokmål (norsk bokmål)
 # Exported from translatewiki.net
 # Author: Dittaeva
 # Author: Gnonthgol

diff --git a/l10n/locale/nn_NO/p2_main.properties b/l10n/locale/nn_NO/p2_main.properties
index fc1d256d3a405cfcc8fc452f0476a93cdbd98beb..2054a28f1b9558b0231575dbc63e72ab32306f03 100644 (file)
--- a/l10n/locale/nn_NO/p2_main.properties
+++ b/l10n/locale/nn_NO/p2_main.properties
@@ -1,4 +1,4 @@
-# Messages for Norwegian Nynorsk (norsk (nynorsk)‎)
+# Messages for Norwegian Nynorsk (norsk nynorsk)
 # Exported from translatewiki.net
 # Author: Dittaeva
 # Author: Gnonthgol

diff --git a/resources/features/pois/shopping_department_store.n.24.png b/resources/features/pois/shopping_department_store.n.24.png
new file mode 100644 (file)
index 0000000..7681011
Binary files /dev/null and b/resources/features/pois/shopping_department_store.n.24.png differ

diff --git a/resources/icons/shopping_department_store.n.16.png b/resources/icons/shopping_department_store.n.16.png
new file mode 100644 (file)
index 0000000..9932087
Binary files /dev/null and b/resources/icons/shopping_department_store.n.16.png differ

diff --git a/resources/map_features/shopping.xml b/resources/map_features/shopping.xml
index dc46eaf9e186520c1cd13083087fca8188c7857d..b409c2bb83511f477b822a0488d49a33d885c87a 100644 (file)
--- a/resources/map_features/shopping.xml
+++ b/resources/map_features/shopping.xml
@@ -148,6 +148,20 @@
   </feature>
 
 
+  <feature name="Department Store">
+    <category>shopping</category>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Ddepartment_store</help>
+    <point/>
+    <area/>
+    <inputSet ref="simpleName"/>
+    <inputSet ref="web"/>
+    <inputSet ref="buildingAddress"/>
+    <icon image="features/pois/shopping_department_store.n.24.png"/>
+    <tag k="shop" v="department_store"/>
+    <inputSet ref="common"/>
+  </feature>
+
+
   <feature name="DIY">
     <category>shopping</category>
     <point/>

diff --git a/resources/stylesheets/core_pois.css b/resources/stylesheets/core_pois.css
index edb8e2e56cdd05fed92a1f7c75b3fb1e398082be..4f070cacfb83a1b1a75c6c0eac51cf081423fe1e 100644 (file)
--- a/resources/stylesheets/core_pois.css
+++ b/resources/stylesheets/core_pois.css
@@ -65,6 +65,7 @@ node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; }
 node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; }
 node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; }
 node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; }
+node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; }
 node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; }
 node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; }
 node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; }