Skip to content

Commit

Permalink
restore accidental changes from development branch (unrelated to pano…
Browse files Browse the repository at this point in the history
…ramax)
  • Loading branch information
tyrasd committed Aug 11, 2024
1 parent c6dfe56 commit b9ee4de
Show file tree
Hide file tree
Showing 21 changed files with 24 additions and 1,314 deletions.
1 change: 0 additions & 1 deletion ACCESSIBILITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ translated to one or more languages.
|| OSM community index | | |
|| iD validation issues | | |
|| KeepRight issues | | |
|| ImproveOSM issues | | |
|| Osmose issues | Translated strings are [provided by Osmose](https://www.transifex.com/openstreetmap-france/osmose/) itself, not iD | |

### Language Coverage
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
* Add Panoramax as new street level imagery provider ([#9941], thanks [@mattiapezzotti])
* Fix intermittent issues with Bing Streetside sometimes returning API results in a undocumented format ([#10341])
#### :white_check_mark: Validation
* Drop deprecated validation service _ImproveOSM_ ([#10302], thanks [@arch0345])
#### :bug: Bugfixes
* Fix bug which required a second button click when resolving/reopening of OSM notes ([#8994], thanks [@laigyu])
* Fix API URLs for ImproveOSM QA service ([#9993], thanks [@k-yle])
Expand Down
3 changes: 1 addition & 2 deletions css/20_map.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
/* No interactivity except what we specifically allow */
.data-layer.osm *,
.data-layer.notes *,
.data-layer.keepRight *,
.data-layer.improveOSM * {
.data-layer.keepRight * {
pointer-events: none;
}

Expand Down
25 changes: 0 additions & 25 deletions css/65_data.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

.qa-header-icon .qaItem-fill,
.layer-keepRight .qaItem .qaItem-fill,
.layer-improveOSM .qaItem .qaItem-fill,
.layer-osmose .qaItem .qaItem-fill {
stroke: #333;
stroke-width: 1.3px; /* NOTE: likely a better way to scale the icon stroke */
Expand Down Expand Up @@ -127,30 +126,6 @@
color: #c35;
}

/* ImproveOSM Issues
------------------------------------------------------- */

.improveOSM.itemType-ow { /* missing one way */
color: #1E90FF;
}

.improveOSM.itemType-mr-road { /* missing road */
color: #B452CD;
}
.improveOSM.itemType-mr-path { /* missing path */
color: #A0522D;
}
.improveOSM.itemType-mr-parking { /* missing parking */
color: #EEEE00;
}
.improveOSM.itemType-mr-both { /* missing road+parking */
color: #FFA500;
}

.improveOSM.itemType-tr { /* missing turn restriction */
color: #EC1C24;
}

/* Custom Map Data (geojson, gpx, kml, vector tile) */
.layer-mapdata {
pointer-events: none;
Expand Down
32 changes: 1 addition & 31 deletions data/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -844,9 +844,6 @@ en:
keepRight:
tooltip: Data issues detected by keepright.at
title: KeepRight Issues
improveOSM:
tooltip: Missing data detected by improveosm.org
title: ImproveOSM Issues
osmose:
tooltip: Data issues detected by osmose.openstreetmap.fr
title: Osmose Issues
Expand Down Expand Up @@ -1101,33 +1098,6 @@ en:
elems_title: Features
fix_title: Fix Guidelines
trap_title: Common Mistakes
improveOSM:
title: ImproveOSM Detection
geometry_types:
path: paths
parking: parking
road: roads
both: roads and parking
directions:
east: east
north: north
northeast: northeast
northwest: northwest
south: south
southeast: southeast
southwest: southwest
west: west
error_types:
ow:
title: Missing One-way
description: 'Along this section of {highway}, {percentage}% of {num_trips} recorded trips travel from {from_node} to {to_node}. There may be missing a "oneway" tag.'
mr:
title: Missing Geometry
description: '{num_trips} recorded trips in this area suggest there may be unmapped {geometry_type} here.'
description_alt: 'Data from a 3rd party suggests there may be unmapped {geometry_type} here.'
tr:
title: Missing Turn Restriction
description: '{num_passed} of {num_trips} recorded trips (travelling {travel_direction}) make a turn from {from_way} to {to_way} at {junction}. There may be a missing "{turn_restriction}" restriction.'
keepRight:
title: KeepRight
detail_description: Description
Expand Down Expand Up @@ -1696,7 +1666,7 @@ en:
title: Quality Assurance
intro: "*Quality Assurance* (Q/A) tools can find improper tags, disconnected roads, and other issues with OpenStreetMap, which mappers can then fix. To view existing Q/A issues, open the {data_icon} **{map_data}** panel and enable a specific Q/A layer."
tools_h: "Tools"
tools: "The following tools are currently supported: [KeepRight](https://www.keepright.at/), [ImproveOSM](https://improveosm.org/en/) and [Osmose](https://osmose.openstreetmap.fr/)."
tools: "The following tools are currently supported: [KeepRight](https://www.keepright.at/) and [Osmose](https://osmose.openstreetmap.fr/)."
issues_h: "Handling Issues"
issues: "Handling Q/A issues is similar to handling notes. Select a marker to view the issue details in the sidebar. Each tool has its own capabilities, but generally you can comment and/or close an issue."
field:
Expand Down
10 changes: 0 additions & 10 deletions data/qa_data.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
{
"improveOSM": {
"icons": {
"ow": "fas-long-arrow-alt-right",
"mr-both": "maki-car",
"mr-parking": "maki-parking",
"mr-path": "maki-shoe",
"mr-road": "maki-car",
"tr": "temaki-junction"
}
},
"osmose": {
"icons": {
"0-1": "maki-home",
Expand Down
11 changes: 0 additions & 11 deletions modules/modes/select_error.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { services } from '../services';
import { modeBrowse } from './browse';
import { modeDragNode } from './drag_node';
import { modeDragNote } from './drag_note';
import { uiImproveOsmEditor } from '../ui/improveOSM_editor';
import { uiKeepRightEditor } from '../ui/keepRight_editor';
import { uiOsmoseEditor } from '../ui/osmose_editor';
import { utilKeybinding } from '../util';
Expand All @@ -29,16 +28,6 @@ export function modeSelectError(context, selectedErrorID, selectedErrorService)
var errorService = services[selectedErrorService];
var errorEditor;
switch (selectedErrorService) {
case 'improveOSM':
errorEditor = uiImproveOsmEditor(context)
.on('change', function() {
context.map().pan([0,0]); // trigger a redraw
var error = checkSelectedID();
if (!error) return;
context.ui().sidebar
.show(errorEditor.error(error));
});
break;
case 'keepRight':
errorEditor = uiKeepRightEditor(context)
.on('change', function() {
Expand Down
Loading

0 comments on commit b9ee4de

Please sign in to comment.