Merge branch 'master' into address-customization

CHANGELOG.md

@@ -1,5 +1,32 @@
 :warning: = Breaking change, may affect downstream projects or sites that embed iD.
 
+## 2.0.2
+##### Dec 22, 2016
+* Bugfixes:
+  * Update imageryBlacklists function to use blacklists from OSM API (#3623)
+  * Better checks for invalid ids in Select mode (#3640)
+  * Unable to toggle oneway=yes on highways (#3638)
+  * Hide labels along selected ways or near selected vertices (#3636)
+  * Windows/Chrome bug: missing mouseup was getting users stuck and unable to select features (#2151)
+  * Fix map moving with middle mouse click (#3612)
+* New Features:
+  * Pull LTR/RTL list from Transifex instead of hardcoding it (#3489)
+  * Refocus map and selectedIDs on undo/redo (#2204)
+  * Display labels for vertices (#2709)
+* Presets:
+  * Add Waterfall Preset (#3608)
+  * Adjust matchscores so that barrier doesn't take priority over other features (#3647)
+  * Add Public Bath Preset (#3642, thanks @Natsuyasumi)
+  * Remove "Covered" field from Bus Stop preset (#3627)
+  * Add surveillance and camera related presets (#3599, thanks @bkil)
+  * Add amenity=food_court and amenity=crematorium (#3621, thanks @samely)
+  * Add maxheight field and add it to many highway presets (#3605)
+  * Add fence and wall type fields, add height field to some barriers (#3602)
+  * Add presets for Aquarium, Resort, Dance Hall (#3579)
+  * Add Internet Access fields to many presets (#3568, thanks @bkil)
+  * Add highway=traffic_mirror preset (#3568, thanks @bkil)
+  * Improvements to Mast/Tower presets (#3561, thanks @bkil)
+
 ## 2.0.1
 ##### Nov 17, 2016
 * Bugfixes:

css/app.css

@@ -11,7 +11,10 @@ html, body {
 }
 
 body {
-    font:normal 12px/1.6667 'Helvetica Neue', Arial, sans-serif;
+    font: normal 12px/1.6667 -apple-system, BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
     margin:0;
     padding:0;
     min-width: 768px;
@@ -148,7 +151,10 @@ a:hover {
 
 textarea  {
     resize: vertical;
-    font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif;
+    font:normal 12px/20px -apple-system, BlinkMacSystemFont,
+        "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell",
+        "Fira Sans", "Droid Sans", "Helvetica Neue", "Arial",
+        sans-serif;
 }
 
 textarea,

css/map.css

@@ -296,25 +296,34 @@ path.fill.tag-landuse-commercial {
     background-color: rgba(214, 136, 26, 0.3);
 }
 
-path.stroke.tag-landuse-industrial {
+path.stroke.tag-landuse-industrial,
+path.stroke.tag-power-plant {
     stroke: rgb(228, 164, 245);
 }
-path.fill.tag-landuse-industrial {
+path.fill.tag-landuse-industrial,
+path.fill.tag-power-plant {
     stroke: rgba(228, 164, 245, 0.3);
     fill: rgba(228, 164, 245, 0.3);
 }
-.preset-icon-fill-area.tag-landuse-industrial {
+.preset-icon-fill-area.tag-landuse-industrial,
+.preset-icon-fill-area.tag-power-plant {
     border-color: rgb(228, 164, 245);
     background-color: rgba(228, 164, 245, 0.3);
 }
 
+path.stroke.tag-natural-bare_rock,
+path.stroke.tag-natural-scree,
 path.stroke.tag-landuse-quarry {
     stroke: rgb(166, 149, 123);
 }
+path.fill.tag-natural-bare_rock,
+path.fill.tag-natural-scree,
 path.fill.tag-landuse-quarry {
     stroke: rgba(166, 149, 123, 0.2);
     fill: rgba(166, 149, 123, 0.2);
 }
+.preset-icon-fill-area.tag-natural-bare_rock,
+.preset-icon-fill-area.tag-natural-scree,
 .preset-icon-fill-area.tag-landuse-quarry {
     border-color: rgb(166, 149, 123);
     background-color: rgba(166, 149, 123, 0.2);
@@ -343,13 +352,16 @@ path.stroke.tag-landuse.tag-status {
     background-color: rgba(196, 189, 25, 0.2);
 }
 
+path.stroke.tag-military,
 path.stroke.tag-landuse-military {
     stroke: rgb(214, 136, 26);
 }
+path.fill.tag-military,
 path.fill.tag-landuse-military {
     stroke: rgba(214, 136, 26, 0.2);
     fill: rgba(214, 136, 26, 0.2);
 }
+.preset-icon-fill-area.tag-military,
 .preset-icon-fill-area.tag-landuse-military {
     border-color: rgb(214, 136, 26);
     background-color: rgba(214, 136, 26, 0.2);
@@ -377,13 +389,16 @@ path.stroke.tag-landuse-meadow {
     background-color: rgba(182, 225, 153, 0.2);
 }
 
-.pattern-color-beach {
+.pattern-color-beach,
+.pattern-color-sand {
     fill: rgba(255, 255, 126, 0.2);
 }
-path.stroke.tag-natural-beach {
+path.stroke.tag-natural-beach,
+path.stroke.tag-natural-sand {
     stroke: rgb(255, 255, 126);
 }
-.preset-icon-fill-area.tag-natural-beach {
+.preset-icon-fill-area.tag-natural-beach,
+.preset-icon-fill-area.tag-natural-sand {
     border-color: rgb(255, 255, 126);
     background-color: rgba(255, 255, 126, 0.2);
 }

data/core.yaml

@@ -77,17 +77,25 @@ en:
       connected_to_hidden: This line can't be straightened because it is connected to a hidden feature.
     delete:
       title: Delete
-      description: Delete object permanently.
+      description:
+        single: Delete this feature permanently.
+        multiple: Delete these features permanently.
       annotation:
         point: Deleted a point.
         vertex: Deleted a node from a way.
         line: Deleted a line.
         area: Deleted an area.
         relation: Deleted a relation.
-        multiple: "Deleted {n} objects."
-      incomplete_relation: This feature can't be deleted because it hasn't been fully downloaded.
-      part_of_relation: This feature can't be deleted because it's part of a larger relation. You must remove it from the relation first.
-      connected_to_hidden: This can't be deleted because it is connected to a hidden feature.
+        multiple: "Deleted {n} features."
+      incomplete_relation:
+        single: This feature can't be deleted because it hasn't been fully downloaded.
+        multiple: These features can't be deleted because they haven't been fully downloaded.
+      part_of_relation:
+        single: This feature can't be deleted because it is part of a larger relation. You must remove it from the relation first.
+        multiple: These features can't be deleted because they are part of larger relations. You must remove them from the relations first.
+      connected_to_hidden:
+        single: This feature can't be deleted because it is connected to a hidden feature.
+        multiple: These features can't be deleted because some are connected to hidden features.
     add_member:
       annotation: Added a member to a relation.
     delete_member:
@@ -118,26 +126,72 @@ en:
       conflicting_tags: These features can't be merged because some of their tags have conflicting values.
     move:
       title: Move
-      description: Move this to a different location.
+      description:
+        single: Move this feature to a different location.
+        multiple: Move these features to a different location.
       key: M
       annotation:
         point: Moved a point.
         vertex: Moved a node in a way.
         line: Moved a line.
         area: Moved an area.
-        multiple: Moved multiple objects.
-      incomplete_relation: This feature can't be moved because it hasn't been fully downloaded.
-      too_large: This can't be moved because not enough of it is currently visible.
-      connected_to_hidden: This can't be moved because it is connected to a hidden feature.
+        multiple: Moved multiple features.
+      incomplete_relation:
+        single: This feature can't be moved because it hasn't been fully downloaded.
+        multiple: These features can't be moved because they haven't been fully downloaded.
+      too_large:
+        single: This feature can't be moved because not enough of it is currently visible.
+        multiple: These features can't be moved because not enough of them are currently visible.
+      connected_to_hidden:
+        single: This feature can't be moved because it is connected to a hidden feature.
+        multiple: These features can't be moved because some are connected to hidden features.
+    reflect:
+      title: reflect
+      description:
+        long:
+          single: Reflect this feature across its long axis.
+          multiple: Reflect these features across their long axis.
+        short:
+          single: Reflect this feature across its short axis.
+          multiple: Reflect these features across their short axis.
+      key:
+        long: T
+        short: Y
+      annotation:
+        long:
+          single: Reflected an feature across its long axis.
+          multiple: Reflected multiple features across their long axis.
+        short:
+          single: Reflected an feature across its short axis.
+          multiple: Reflected multiple features across their short axis.
+      incomplete_relation:
+        single: This feature can't be reflected because it hasn't been fully downloaded.
+        multiple: These features can't be reflected because they haven't been fully downloaded.
+      too_large:
+        single: This feature can't be reflected because not enough of it is currently visible.
+        multiple: These features can't be reflected because not enough of them are currently visible.
+      connected_to_hidden:
+        single: This feature can't be reflected because it is connected to a hidden feature.
+        multiple: These features can't be reflected because some are connected to hidden features.
     rotate:
       title: Rotate
-      description: Rotate this object around its center point.
+      description:
+        single: Rotate this feature around its center point.
+        multiple: Rotate these features around their center point.
       key: R
       annotation:
         line: Rotated a line.
         area: Rotated an area.
-      too_large: This can't be rotated because not enough of it is currently visible.
-      connected_to_hidden: This can't be rotated because it is connected to a hidden feature.
+        multiple: Rotated multiple features.
+      incomplete_relation:
+        single: This feature can't be rotated because it hasn't been fully downloaded.
+        multiple: These features can't be rotated because they haven't been fully downloaded.
+      too_large:
+        single: This feature can't be rotated because not enough of it is currently visible.
+        multiple: These features can't be rotated because not enough of them are currently visible.
+      connected_to_hidden:
+        single: This feature can't be rotated because it is connected to a hidden feature.
+        multiple: These features can't be rotated because some are connected to hidden features.
     reverse:
       title: Reverse
       description: Make this line go in the opposite direction.
@@ -256,7 +310,7 @@ en:
     back_tooltip: Change feature
     remove: Remove
     search: Search
-    multiselect: Selected items
+    multiselect: Selected features
     unknown: Unknown
     incomplete: <not downloaded>
     feature_list: Search features
@@ -369,12 +423,12 @@ en:
       done: "All conflicts resolved!"
       help: |
         Another user changed some of the same map features you changed.
-        Click on each item below for more details about the conflict, and choose whether to keep
+        Click on each feature below for more details about the conflict, and choose whether to keep
         your changes or the other user's changes.
   merge_remote_changes:
     conflict:
-      deleted: 'This object has been deleted by {user}.'
-      location: 'This object was moved by both you and {user}.'
+      deleted: 'This feature has been deleted by {user}.'
+      location: 'This feature was moved by both you and {user}.'
       nodelist: 'Nodes were changed by both you and {user}.'
       memberlist: 'Relation members were changed by both you and {user}.'
       tags: 'You changed the <b>{tag}</b> tag to "{local}" and {user} changed it to "{remote}".'
@@ -408,7 +462,7 @@ en:
     untagged_point: Untagged point
     untagged_line: Untagged line
     untagged_area: Untagged area
-    many_deletions: "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org."
+    many_deletions: "You're deleting {n} features. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org."
     tag_suggests_area: "The tag {tag} suggests line should be area, but it is not an area"
     untagged_point_tooltip: "Select a feature type that describes what this point is."
     untagged_line_tooltip: "Select a feature type that describes what this line is."

data/phone-formats.json

@@ -49,6 +49,7 @@
         "ru": "+7 495 1234567",
         "kz": "+7 495 1234567",
         "vn": "+84 1 234 5678",
-        "hk": "+852 12345678"
+        "hk": "+852 1234 5678",
+        "tw": "+886 1 2345 6789"
     }
 }