Merge pull request #2357 from bhousel/feature-filtering

Feature filtering

data/core.yaml

@@ -55,6 +55,7 @@ en:
         area: Made an area circular.
       not_closed: This can't be made circular because it's not a loop.
       too_large: This can't be made circular because not enough of it is currently visible.
+      connected_to_hidden: This can't be made circular because it is connected to a hidden feature.
     orthogonalize:
       title: Square
       description:
@@ -66,12 +67,14 @@ en:
         area: Squared the corners of an area.
       not_squarish: This can't be made square because it is not squarish.
       too_large: This can't be made square because not enough of it is currently visible.
+      connected_to_hidden: This can't be made square because it is connected to a hidden feature.
     straighten:
       title: Straighten
       description: Straighten this line.
       key: S
       annotation: Straightened a line.
       too_bendy: This can't be straightened because it bends too much.
+      connected_to_hidden: This line can't be straightened because it is connected to a hidden feature.
     delete:
       title: Delete
       description: Delete object permanently.
@@ -83,6 +86,7 @@ en:
         relation: Deleted a relation.
         multiple: "Deleted {n} objects."
       incomplete_relation: This feature can't be deleted because it hasn't been fully downloaded.
+      connected_to_hidden: This can't be deleted because it is connected to a hidden feature.
     add_member:
       annotation: Added a member to a relation.
     delete_member:
@@ -99,6 +103,7 @@ en:
       key: D
       annotation: Disconnected lines/areas.
       not_connected: There aren't enough lines/areas here to disconnect.
+      connected_to_hidden: This can't be disconnected because it is connected to a hidden feature.
     merge:
       title: Merge
       description: Merge these lines.
@@ -120,6 +125,7 @@ en:
         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.
     rotate:
       title: Rotate
       description: Rotate this object around its center point.
@@ -128,6 +134,7 @@ en:
         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.
     reverse:
       title: Reverse
       description: Make this line go in the opposite direction.
@@ -146,6 +153,7 @@ en:
         multiple: "Split {n} lines/area boundaries."
       not_eligible: Lines can't be split at their beginning or end.
       multiple_ways: There are too many lines here to split.
+      connected_to_hidden: This can't be split because it is connected to a hidden feature.
     restriction:
       help:
         select: Click to select a road segment.
@@ -172,6 +180,9 @@ en:
   logout: logout
   loading_auth: "Connecting to OpenStreetMap..."
   report_a_bug: report a bug
+  feature_info:
+    hidden_warning: "{count} hidden features"
+    hidden_details: "These features are currently hidden: {details}"
   status:
     error: Unable to connect to API.
     offline: The API is offline. Please try editing later.
@@ -238,6 +249,60 @@ en:
     custom_prompt: "Enter a tile URL template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme."
     fix_misalignment: Fix alignment
     reset: reset
+  map_data:
+    title: Map Data
+    description: Map Data
+    data_layers: Data Layers
+    fill_area: Fill Areas
+    map_features: Map Features
+    autohidden: "These features have been automatically hidden because too many would be shown on the screen.  You can zoom in to edit them."
+  feature:
+    points:
+      description: Points
+      tooltip: "Points of Interest"
+    major_roads:
+      description: Major Roads
+      tooltip: "Highways, Streets, etc."
+    minor_roads:
+      description: Minor Roads
+      tooltip: "Service Roads, Parking Aisles, Tracks, etc."
+    paths:
+      description: Paths
+      tooltip: "Sidewalks, Foot Paths, Cycle Paths, etc."
+    buildings:
+      description: Buildings
+      tooltip: "Buildings, Shelters, Garages, etc."
+    landuse:
+      description: Landuse Features
+      tooltip: "Forests, Farmland, Parks, Residential, Commercial, etc."
+    boundaries:
+      description: Boundaries
+      tooltip: "Administrative Boundaries"
+    water:
+      description: Water Features
+      tooltip: "Rivers, Lakes, Ponds, Basins, etc."
+    rail:
+      description: Rail Features
+      tooltip: "Railways"
+    power:
+      description: Power Features
+      tooltip: "Power Lines, Power Plants, Substations, etc."
+    past_future:
+      description: Past/Future
+      tooltip: "Proposed, Construction, Abandoned, Demolished, etc."
+    others:
+      description: Others
+      tooltip: "Everything Else"
+  area_fill:
+    wireframe:
+      description: No Fill (Wireframe)
+      tooltip: "Enabling wireframe mode makes it easy to see the background imagery."
+    partial:
+      description: Partial Fill
+      tooltip: "Areas are drawn with fill only around their inner edges. (Recommended for beginner mappers)"
+    full:
+      description: Full Fill
+      tooltip: "Areas are drawn fully filled."
   restore:
     heading: You have unsaved changes
     description: "Do you wish to restore unsaved changes from a previous editing session?"
@@ -419,8 +484,8 @@ en:
       [Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).
 
       To use a GPX track for mapping, drag and drop the GPX file onto the map
-      editor. If it's recognized, it will be added to the map as a bright green
-      line. Click on the 'Background Settings' menu on the right side to enable,
+      editor. If it's recognized, it will be added to the map as a bright purple
+      line. Click on the 'Map Data' menu on the right side to enable,
       disable, or zoom to this new GPX-powered layer.
 
       The GPX track isn't directly uploaded to OpenStreetMap - the best way to