Skip to content
Permalink
Browse files

fix regression tests with OGR2

  • Loading branch information...
olt committed Aug 7, 2018
1 parent 5496e14 commit 234ddf89d97b7c707aa5a0538539f601165e07ea
@@ -20,21 +20,21 @@ $(MARGNACARTO_BIN):
../../magnacarto -mss $< > $@

%.result.map: %.mss $(MARGNACARTO_BIN)
../../magnacarto -mss $< -mapfile > $@
../../magnacarto -mss $< -builder mapserver -ms-no-map-block > $@


%.cmp.xml: %.result.xml %.expected.xml
diff $^
%.cmp.xml: %.expected.xml %.result.xml
diff -wu $^

%.cmp.map: %.result.map %.expected.map
diff $^
%.cmp.map: %.expected.map %.result.map
diff -wu $^

refresh-expected: $(EXPECTED_XML) $(EXPECTED_MAP)

%.expected.xml: %.mss $(MARGNACARTO_BIN)
../../magnacarto -mss $< > $@

%.expected.map: %.mss $(MARGNACARTO_BIN)
../../magnacarto -mss $< -mapfile > $@
../../magnacarto -mss $< -builder mapserver -ms-no-map-block > $@

# clean:
# clean:
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -16,8 +16,8 @@ Map { background-color: white; }
// shield-min-padding: 50;
// [id=1] { marker-opacity: .5; }

[id=2] { shield-spacing: 20; }
[id=3] { shield-spacing: 30; }
[id=4] { shield-spacing: 40; }
[id=2] { shield-repeat-distance: 20; shield-spacing: 20; }
[id=3] { shield-repeat-distance: 30; shield-spacing: 30; }
[id=4] { shield-repeat-distance: 40; shield-spacing: 40; }

}
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},
@@ -5,7 +5,7 @@
"file": "data.geojson",
"srs": "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs",
"srid": "4326",
"layer": "OGRGeoJSON",
"layer": "data",
"type": "ogr"
},
"advanced": {},

0 comments on commit 234ddf8

Please sign in to comment.
You can’t perform that action at this time.