CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-01 12:41:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

move maprules/mapcss to a service class

Browse Source 
ref #remote-presets
This commit is contained in:
Max Grossman
2018-09-23 18:38:01 -04:00
parent 155983197f 85383c314d
commit 0a31137c78
327 changed files with 21654 additions and 7363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/validations/mapcss_checks.js
+13 -8
View File
@@ -1,17 +1,22 @@
import { serviceMapRules } from '../services';
export function validationMapCSSChecks() {
var validation = function(changes, graph, rules) {
var validation = function(changes, graph) {
var rules = serviceMapRules.validationRules();
var warnings = [];
var createdModified = ['created', 'modified'];
for (var i = 0; i < createdModified.length; i++) {
var entities = changes[createdModified[i]];
for (var j = 0; j < entities.length; j++) {
var entity = entities[j];
for (var k = 0; k < rules.length; k++) {
var rule = rules[k];
rule.findWarnings(entity, graph, warnings);
for (var i = 0; i < rules.length; i++) {
var rule = rules[i];
for (var j = 0; j < createdModified.length; j++) {
var type = createdModified[j];
var entities = changes[type];
for (var k = 0; k < entities.length; k++) {
rule.findWarnings(entities[k], graph, warnings);
}
}
}
return warnings;
};
return validation;
modules/validations/tag_suggests_area.js
+5 -1
View File
@@ -12,7 +12,11 @@ export function validationTagSuggestsArea() {
var presence = ['landuse', 'amenities', 'tourism', 'shop'];
for (var i = 0; i < presence.length; i++) {
if (tags[presence[i]] !== undefined) {
return presence[i] + '=' + tags[presence[i]];
if (presence[i] === 'tourism' && tags[presence[i]] === 'artwork') {
continue; // exception for tourism=artwork - #5206
} else {
return presence[i] + '=' + tags[presence[i]];
}
}
}