ADD map feature: ToyShop

IMPROVE all "shopping" features work for areas as well as points
BONUS comments in Feature.as and remove commented code in WayUI.as

diff --git a/net/systemeD/halcyon/WayUI.as b/net/systemeD/halcyon/WayUI.as
index 3da196e565df961217ff70f12c23afce65d879bc..c07d9e9cec64de97b84d57c7d7b78d4f754a2ac3 100644 (file)
--- a/net/systemeD/halcyon/WayUI.as
+++ b/net/systemeD/halcyon/WayUI.as
@@ -438,7 +438,6 @@ package net.systemeD.halcyon {
                     dx=paint.map.lon2coord(nextNode.lon)-curx;
                                        cury=paint.map.latp2coord(node.latp);
                     dy=paint.map.latp2coord(nextNode.latp)-cury;
                     dx=paint.map.lon2coord(nextNode.lon)-curx;
                                        cury=paint.map.latp2coord(node.latp);
                     dy=paint.map.latp2coord(nextNode.latp)-cury;

-                                       //a=Math.atan2(dy,dx); xc=Math.cos(a); yc=Math.sin(a);

                                        segleft=Math.sqrt(dx*dx+dy*dy);
                                        xc = dx/segleft;
                                        yc = dy/segleft;
                                        segleft=Math.sqrt(dx*dx+dy*dy);
                                        xc = dx/segleft;
                                        yc = dy/segleft;

diff --git a/net/systemeD/potlatch2/mapfeatures/Feature.as b/net/systemeD/potlatch2/mapfeatures/Feature.as
index 608911143c54ff5e7ad1d8090b9e0a6a87db6840..c8ae80f93ed5a5c1094de9e9e325758165858bb6 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/Feature.as
+++ b/net/systemeD/potlatch2/mapfeatures/Feature.as
@@ -26,6 +26,7 @@ package net.systemeD.potlatch2.mapfeatures {
         public var missingIconCls:Class;
 
 
         public var missingIconCls:Class;
 
 

+        /** Create this Feature from an XML subtree. */

         public function Feature(mapFeatures:MapFeatures, _xml:XML) {
             this.mapFeatures = mapFeatures;
             this._xml = _xml;
         public function Feature(mapFeatures:MapFeatures, _xml:XML) {
             this.mapFeatures = mapFeatures;
             this._xml = _xml;


@@ -99,14 +100,14 @@ package net.systemeD.potlatch2.mapfeatures {
         }
 
         [Bindable(event="nameChanged")]
         }
 
         [Bindable(event="nameChanged")]

-        /** The human-readable name of the feature, or null if none. */
+        /** The human-readable name of the feature (@name), or null if none. */

         public function get name():String {
                        if (_xml.attribute('name').length()>0) { return _xml.@name; }
                        return null;
         }
 
         [Bindable(event="imageChanged")]
         public function get name():String {
                        if (_xml.attribute('name').length()>0) { return _xml.@name; }
                        return null;
         }
 
         [Bindable(event="imageChanged")]

-        /** An icon for the feature. If none is defined, return default "missing icon". */
+        /** An icon for the feature (from icons[0]/@image). If none is defined, return default "missing icon". */

         public function get image():ByteArray {
             var icon:XMLList = _xml.icon;
             var imageURL:String = null;
         public function get image():ByteArray {
             var icon:XMLList = _xml.icon;
             var imageURL:String = null;


@@ -134,6 +135,7 @@ package net.systemeD.potlatch2.mapfeatures {
             return makeHTMLIcon(icon, entity);
         }
 
             return makeHTMLIcon(icon, entity);
         }
 

+        /** Convert the contents of the "icon" tag as an HTML string, with variable substitution. */

         public static function makeHTMLIcon(icon:XMLList, entity:Entity):String {
             if ( icon == null )
                 return "";
         public static function makeHTMLIcon(icon:XMLList, entity:Entity):String {
             if ( icon == null )
                 return "";


@@ -147,6 +149,7 @@ package net.systemeD.potlatch2.mapfeatures {
             return txt;
         }
 
             return txt;
         }
 

+        /** Basic HTML escaping. */

         public static function htmlEscape(str:String):String {
             var newStr:String = str.replace(/&/g, "&");
             newStr = newStr.replace(/</g, "&lt;");
         public static function htmlEscape(str:String):String {
             var newStr:String = str.replace(/&/g, "&amp;");
             newStr = newStr.replace(/</g, "&lt;");

diff --git a/resources/map_features/shopping.xml b/resources/map_features/shopping.xml
index 674c1c373f5143718d09801e5907317e2c754c58..cac5511072356616deae8729bf73fc90e73c9b7c 100644 (file)
--- a/resources/map_features/shopping.xml
+++ b/resources/map_features/shopping.xml
@@ -6,6 +6,7 @@
     </icon>\r
     <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>\r
     <point/>\r
     </icon>\r
     <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>\r
     <point/>\r

+    <area/>\r

     <tag k="shop" v="supermarket"/>\r
     <inputSet ref="names"/>\r
     <inputSet ref="web"/>\r
     <tag k="shop" v="supermarket"/>\r
     <inputSet ref="names"/>\r
     <inputSet ref="web"/>\r


@@ -20,6 +21,7 @@
     </icon>\r
     <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience</help>\r
     <point/>\r
     </icon>\r
     <help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dconvenience</help>\r
     <point/>\r

+    <area/>\r

     <tag k="shop" v="convenience"/>\r
     <inputSet ref="names"/>\r
     <inputSet ref="web"/>\r
     <tag k="shop" v="convenience"/>\r
     <inputSet ref="names"/>\r
     <inputSet ref="web"/>\r


@@ -30,6 +32,7 @@
   <feature name="Bakery">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Bakery">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -44,6 +47,7 @@
   <feature name="Alcohol shop">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Alcohol shop">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -57,6 +61,7 @@
   <feature name="Bike shop">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Bike shop">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -69,6 +74,7 @@
   <feature name="Bookshop">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Bookshop">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -81,6 +87,7 @@
   <feature name="Butcher">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Butcher">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -92,6 +99,7 @@
   <feature name="Car sales">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Car sales">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -104,6 +112,7 @@
   <feature name="Car repair">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Car repair">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -116,6 +125,7 @@
   <feature name="Clothes shop">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Clothes shop">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -128,6 +138,7 @@
   <feature name="Confectionery">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Confectionery">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -140,6 +151,7 @@
   <feature name="DIY">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="DIY">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -152,6 +164,7 @@
   <feature name="Fishmonger">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Fishmonger">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -163,6 +176,7 @@
   <feature name="Florist">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Florist">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -175,6 +189,7 @@
   <feature name="Garden centre">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Garden centre">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -187,6 +202,7 @@
   <feature name="Gift shop">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Gift shop">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -199,6 +215,7 @@
   <feature name="Greengrocer">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Greengrocer">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -211,6 +228,7 @@
   <feature name="Hairdresser">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Hairdresser">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -223,6 +241,7 @@
   <feature name="Hifi shop">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Hifi shop">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -235,6 +254,7 @@
   <feature name="Jewellery">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Jewellery">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -246,6 +266,7 @@
   <feature name="Kiosk">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Kiosk">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -258,6 +279,7 @@
   <feature name="Laundrette">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Laundrette">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -270,6 +292,7 @@
   <feature name="Motorbike shop">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Motorbike shop">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -282,6 +305,7 @@
   <feature name="Music shop">\r
     <category>shopping</category>\r
     <point/>\r
   <feature name="Music shop">\r
     <category>shopping</category>\r
     <point/>\r

+    <area/>\r

     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r
     <inputSet ref="simpleName"/>\r
     <inputSet ref="web"/>\r
     <inputSet ref="buildingAddress"/>\r


@@ -298,6 +322,7 @@
     </icon>\r
     <help>http://wiki.openstreetmap.org/wiki/Pharmacy</help>\r
     <point/>\r
     </icon>\r
     <help>http://wiki.openstreetmap.org/wiki/Pharmacy</help>\r
     <point/>\r

+    <area/>\r

     <tag k="amenity" v="pharmacy"/>\r
     <inputSet ref="names"/>\r
     <inputSet ref="web"/>\r
     <tag k="amenity" v="pharmacy"/>\r
     <inputSet ref="names"/>\r
     <inputSet ref="web"/>\r


@@ -305,6 +330,17 @@
     <input type="checkbox" category="Amenity" presence="always" description="Does this pharmacy sell prescription drugs?" name="Dispensing" key="dispensing" layout="horizontal"/>\r
     <inputSet ref="common"/>\r
   </feature>\r
     <input type="checkbox" category="Amenity" presence="always" description="Does this pharmacy sell prescription drugs?" name="Dispensing" key="dispensing" layout="horizontal"/>\r
     <inputSet ref="common"/>\r
   </feature>\r

+\r
+  <feature name="Toy shop">\r
+    <category>shopping</category>\r
+    <point/>\r
+    <area/>\r
+    <inputSet ref="simpleName"/>\r
+    <inputSet ref="web"/>\r
+    <inputSet ref="buildingAddress"/>\r
+    <tag k="shop" v="toys"/>\r
+    <inputSet ref="common"/>\r
+  </feature>\r

 </featureGroup>\r
 \r
   
\ No newline at end of file
 </featureGroup>\r
 \r
   
\ No newline at end of file