Merge pull request #1 from mapsme/crossings

Highways crossing borders

scripts/poly2postgis.py

@@ -31,7 +31,7 @@ def read_multipolygon(f):
 	polygons = []
 	cur_poly = []
 	while True:
-		title = f.readline()
+		title = f.readline().strip()
 		if not title:
 			return None
 		if title == 'END':
@@ -60,7 +60,7 @@ def convert_poly(input_file, cur):
 		wkt = read_multipolygon(f)
 	print '  ', name
 	try:
-		cur.execute('insert into borders (name, geom) values (%s, ST_GeomFromText(%s))', (name, wkt))
+		cur.execute('insert into borders (name, geom, modified) values (%s, ST_GeomFromText(%s), now())', (name, wkt))
 	except psycopg2.Error as e:
 		print wkt
 		raise e

scripts/process_planet.sh

@@ -37,10 +37,13 @@ echo Cleaning up tiles table and index
 psql $DATABASE -c "DELETE FROM $TABLE; DROP INDEX IF EXISTS ${TABLE}_idx;"
 
 echo Loading tiles into the database
-pv $PLANET-tiles.csv | python tiles2pg.py -d $DATABASE -t $TABLE
+pv $PLANET-tiles.csv | python "$(dirname "$0")/tiles2pg.py" -d $DATABASE -t $TABLE
 rm $PLANET-tiles.csv
 
 echo Indexing tiles
 psql $DATABASE -c "CREATE INDEX ${TABLE}_idx ON $TABLE USING GIST (tile);"
 
+echo Dumping the table
+pg_dump -t $TABLE $DATABASE | gzip > $PLANET-tiles.sql.gz
+
 echo Done!

server/borders_api.py

@@ -23,9 +23,9 @@ def hello_world():
 
 @app.route('/www/<path:path>')
 def send_js(path):
-        if config.DEBUG:
-                return send_from_directory('../www/', path)
-        abort(404)
+	if config.DEBUG:
+		return send_from_directory('../www/', path)
+	abort(404)
 
 @app.before_request
 def before_request():
@@ -103,20 +103,46 @@ def query_routing_points():
 	ymin = request.args.get('ymin')
 	ymax = request.args.get('ymax')
 	cur = g.conn.cursor()
-	cur.execute('''SELECT ST_X(geom), ST_Y(geom), type
-			FROM points
-			WHERE geom && ST_MakeBox2D(ST_Point(%s, %s), ST_Point(%s, %s)
-		);''', (xmin, ymin, xmax, ymax))
+	try:
+		cur.execute('''SELECT ST_X(geom), ST_Y(geom), type
+				FROM points
+				WHERE geom && ST_MakeBox2D(ST_Point(%s, %s), ST_Point(%s, %s)
+			);''', (xmin, ymin, xmax, ymax))
+	except psycopg2.Error, e:
+		return jsonify(features=[])
 	result = []
 	for rec in cur:
 		result.append({ 'lon': rec[0], 'lat': rec[1], 'type': rec[2] })
 	return jsonify(features=result)
 
+@app.route('/crossing')
+def query_crossing():
+	xmin = request.args.get('xmin')
+	xmax = request.args.get('xmax')
+	ymin = request.args.get('ymin')
+	ymax = request.args.get('ymax')
+	region = request.args.get('region')
+	cur = g.conn.cursor()
+	sql = """SELECT id, ST_AsGeoJSON(line, 7) as geometry, region, processed FROM {table}
+		WHERE line && ST_MakeBox2D(ST_Point(%s, %s), ST_Point(%s, %s)) and processed = 0 {reg};
+		""".format(table=config.CROSSING_TABLE, reg='and region = %s' if region else '')
+	params = [xmin, ymin, xmax, ymax]
+	if region:
+		params.append(region)
+	cur.execute(sql, tuple(params))
+	result = []
+	for rec in cur:
+		props = { 'id': rec[0], 'region': rec[2], 'processed': rec[3] }
+		feature = { 'type': 'Feature', 'geometry': json.loads(rec[1]), 'properties': props }
+		result.append(feature)
+	return jsonify(type='FeatureCollection', features=result)
+
 @app.route('/tables')
 def check_osm_table():
 	osm = False
 	backup = False
 	old = []
+	crossing = False
 	try:
 		cur = g.conn.cursor()
 		cur.execute('select osm_id, ST_Area(way), admin_level, name from {} limit 2;'.format(config.OSM_TABLE))
@@ -136,7 +162,14 @@ def check_osm_table():
 				old.append(t)
 		except psycopg2.Error, e:
 			pass
-	return jsonify(osm=osm, tables=old, readonly=config.READONLY, backup=backup)
+	try:
+		cur = g.conn.cursor()
+		cur.execute('select id, ST_Length(line), region, processed from {} limit 2;'.format(config.CROSSING_TABLE))
+		if cur.rowcount == 2:
+			crossing = True
+	except psycopg2.Error, e:
+		pass
+	return jsonify(osm=osm, tables=old, readonly=config.READONLY, backup=backup, crossing=crossing)
 
 @app.route('/split')
 def split():
@@ -333,6 +366,56 @@ def draw_hull():
 	g.conn.commit()
 	return jsonify(status='ok')
 
+@app.route('/fixcrossing')
+def fix_crossing():
+	if config.READONLY:
+		abort(405)
+	preview = request.args.get('preview') == '1'
+	region = request.args.get('region')
+	if region is None:
+		return jsonify(status='Please specify a region')
+	ids = request.args.get('ids')
+	if ids is None or len(ids) == 0:
+		return jsonify(status='Please specify a list of line ids')
+	ids = tuple(ids.split(','))
+	cur = g.conn.cursor()
+	if preview:
+		cur.execute("""
+		WITH lines as (SELECT ST_Buffer(ST_Collect(line), 0.002, 1) as g FROM {cross} WHERE id IN %s)
+		SELECT ST_AsGeoJSON(ST_Collect(ST_MakePolygon(er.ring))) FROM
+		(
+		SELECT ST_ExteriorRing((ST_Dump(ST_Union(ST_Buffer(geom, 0.0), lines.g))).geom) as ring FROM {table}, lines WHERE name = %s
+		) as er
+		""".format(table=config.TABLE, cross=config.CROSSING_TABLE), (ids, region))
+		res = cur.fetchone()
+		if not res:
+			return jsonify(status='Failed to extend geometry')
+		f = { "type": "Feature", "properties": {}, "geometry": json.loads(res[0]) }
+		#return jsonify(type="FeatureCollection", features=[f])
+		return jsonify(type="Feature", properties={}, geometry=json.loads(res[0]))
+	else:
+		cur.execute("""
+		WITH lines as (SELECT ST_Buffer(ST_Collect(line), 0.002, 1) as g FROM {cross} WHERE id IN %s)
+		UPDATE {table} SET geom = res.g FROM
+		(
+		SELECT ST_Collect(ST_MakePolygon(er.ring)) as g FROM
+		(
+		SELECT ST_ExteriorRing((ST_Dump(ST_Union(ST_Buffer(geom, 0.0), lines.g))).geom) as ring FROM {table}, lines WHERE name = %s
+		) as er
+		) as res
+		WHERE name = %s
+		""".format(table=config.TABLE, cross=config.CROSSING_TABLE), (ids, region, region))
+		cur.execute("""
+		UPDATE {table} b SET geom = ST_Difference(b.geom, o.geom)
+		FROM {table} o
+		WHERE ST_Overlaps(b.geom, o.geom)
+		AND o.name = %s
+		""".format(table=config.TABLE), (region,))
+		cur.execute("UPDATE {cross} SET processed = 1 WHERE id IN %s".format(cross=config.CROSSING_TABLE), (ids,))
+		g.conn.commit()
+	return jsonify(status='ok')
+
+
 @app.route('/backup')
 def backup_do():
 	if config.READONLY:

server/config.py

@@ -12,6 +12,8 @@ OSM_TABLE = 'osm_borders'
 OTHER_TABLES = { 'old': 'old_borders' }
 # backup table
 BACKUP = 'borders_backup'
+# table with crossing lines
+CROSSING_TABLE = 'crossing'
 # area of an island for it to be considered small
 SMALL_KM2 = 10
 # force multipolygons in JOSM output

www/borders.js

@@ -11,6 +11,7 @@ var size_good = 5, size_bad = 50;
 var tooSmallLayer = null;
 var oldBordersLayer = null;
 var routingGroup = null;
+var crossingLayer = null;
 
 function init() {
 	map = L.map('map', { editable: true }).setView([30, 0], 3);
@@ -20,7 +21,10 @@ function init() {
 			{ attribution: '© GIScience Heidelberg' }).addTo(map);
 	bordersLayer = L.layerGroup();
 	map.addLayer(bordersLayer);
-	routingGroup = new L.FeatureGroup();
+	routingGroup = L.layerGroup();
+	map.addLayer(routingGroup);
+	crossingLayer = L.layerGroup();
+	map.addLayer(crossingLayer);
 
 	map.on('moveend', function() {
 		if( map.getZoom() >= 5 )
@@ -55,6 +59,8 @@ function checkHasOSM() {
 				$('#old_action').css('display', 'block');
 				$('#josm_old').css('display', 'inline');
 			}
+			if( res.crossing )
+				$('#cross_actions').css('display', 'block');
 			if( !res.backup ) {
 				$('#backups').css('display', 'none');
 			}
@@ -102,6 +108,21 @@ function updateBorders() {
 		dataType: 'json'
 	});
 
+	if (map.getZoom() >= 7) {
+		$.ajax(getServer('crossing'), {
+			data: {
+				'xmin': b.getWest(),
+				'xmax': b.getEast(),
+				'ymin': b.getSouth(),
+				'ymax': b.getNorth()
+			},
+			success: processCrossing,
+			dataType: 'json'
+		});
+	} else {
+		crossingLayer.clearLayers();
+	}
+
 	if( oldBordersLayer != null && OLD_BORDERS_NAME ) {
 		oldBordersLayer.clearLayers();
 		$.ajax(getServer('bbox'), {
@@ -120,16 +141,15 @@ function updateBorders() {
 }
 
 routingTypes = {1: "Border and feature are intersecting several times.",
-                2: "Unknown outgoing feature."};
+		2: "Unknown outgoing feature."};
 
 function processRouting(data) {
-	map.removeLayer(routingGroup);
 	routingGroup.clearLayers();
 	for( var f = 0; f < data.features.length; f++ ) {
-		marker = L.marker([data.features[f]["lat"], data.features[f]["lon"]]).addTo(routingGroup);
+		marker = L.marker([data.features[f]["lat"], data.features[f]["lon"]]);
 		marker.bindPopup(routingTypes[data.features[f]["type"]], {showOnMouseOver: true});
+                routingGroup.addLayer(marker);
 	}
-	map.addLayer(routingGroup);
 }
 
 function processResult(data) {
@@ -757,3 +777,127 @@ function getPolyDownloadLink(bbox) {
 	};
 	return getServer('poly') + (bbox ? '?' + $.param(data) : '');
 }
+
+var crossSelected = null, fcPreview = null;
+var selectedCrossings = {};
+
+function crossingUpdateColor(layer) {
+	layer.setStyle({ color: selectedCrossings[layer.crossId] ? 'red' : 'blue' });
+}
+
+function crossingClicked(e) {
+	if( !crossSelected )
+		return;
+	var layer = e.target;
+	if( 'crossId' in layer ) {
+		var id = layer.crossId;
+		if( selectedCrossings[id] )
+			delete selectedCrossings[id];
+		else
+			selectedCrossings[id] = true;
+		crossingUpdateColor(layer);
+	}
+}
+
+function setBordersSelectable(selectable) {
+	crossingLayer.eachLayer(function(l) {
+		l.bringToFront();
+	});
+}
+
+function processCrossing(data) {
+	crossingLayer.clearLayers();
+	for( var f = 0; f < data.features.length; f++ ) {
+		var layer = L.GeoJSON.geometryToLayer(data.features[f].geometry),
+		    props = data.features[f].properties;
+		layer.crossId = '' + props.id;
+		layer.crossRegion = props.region;
+		crossingUpdateColor(layer);
+		layer.on('click', crossingClicked);
+		crossingLayer.addLayer(layer);
+	}
+}
+
+function selectCrossingByRegion(region) {
+	if( region ) {
+		crossingLayer.eachLayer(function(l) {
+			if( l.crossId && l.crossRegion == region ) {
+				selectedCrossings[l.crossId] = true;
+				crossingUpdateColor(l);
+			}
+		});
+	} else {
+		crossingLayer.eachLayer(function(l) {
+			if( l.crossId ) {
+				delete selectedCrossings[l.crossId];
+				crossingUpdateColor(l);
+			}
+		});
+	}
+}
+
+function bFixCross() {
+	if( !selectedId || !(selectedId in borders) )
+		return;
+	setBordersSelectable(false);
+	crossSelected = selectedId;
+	fcPreview = null;
+	$('#actions').css('display', 'none');
+	$('#fc_sel').text(crossSelected);
+	$('#fc_do').css('display', 'none');
+	$('#fixcross').css('display', 'block');
+	selectCrossingByRegion(crossSelected);
+}
+
+function bFixCrossPreview() {
+	if( fcPreview != null ) {
+		map.removeLayer(fcPreview);
+		fcPreview = null;
+	}
+	$('#fc_do').css('display', 'none');
+	$.ajax(getServer('fixcrossing'), {
+		data: {
+			'preview': 1,
+			'region': crossSelected,
+			'ids': Object.keys(selectedCrossings).join(',')
+		},
+		success: bFixCrossDrawPreview
+	});
+}
+
+function bFixCrossDrawPreview(geojson) {
+	if( !('geometry' in geojson) ) {
+		return;
+	}
+	fcPreview = L.geoJson(geojson, {
+		style: function(f) {
+			return { color: 'red', weight: 1, fill: false };
+		}
+	});
+	map.addLayer(fcPreview);
+	$('#fc_do').css('display', 'block');
+}
+
+function bFixCrossDo() {
+	$.ajax(getServer('fixcrossing'), {
+		data: {
+			'region': crossSelected,
+			'ids': Object.keys(selectedCrossings).join(',')
+		},
+		success: updateBorders
+	});
+	bFixCrossCancel();
+}
+
+function bFixCrossCancel() {
+	if( fcPreview != null ) {
+		map.removeLayer(fcPreview);
+		fcPreview = null;
+	}
+	crossSelected = null;
+	selectCrossingByRegion(false);
+	selectedCrossings = {};
+	updateBorders();
+	$('#actions').css('display', 'block');
+	$('#fixcross').css('display', 'none');
+}

www/index.html

@@ -24,7 +24,7 @@
 			#header { border-bottom: 1px solid gray; margin-bottom: 1em; padding-bottom: 1em; }
 			#f_topo, #f_chars, #f_comments, #links { font-size: 10pt; }
 			#backup_saving, #backup_restoring { margin-bottom: 1em; }
-			#filefm, #old_action, #josm_old { display: none; }
+			#filefm, #old_action, #josm_old, #cross_actions { display: none; }
 			.h_iframe { display: none; width: 230px; height: 80px; }
 		</style>
 	</head>
@@ -86,6 +86,9 @@
 						<button onclick="bDivide()">Заменить регионами</button><br>
 						<button onclick="bPoint()">Регион из точки</button><br>
 					</div>
+					<div id="cross_actions">
+						<button onclick="bFixCross()">Исправить меж-mwm</button><br>
+					</div>
 				</div>
 
 				<div id="info">
@@ -158,6 +161,16 @@
 				<div id="backup_list"></div>
 				<button onclick="bBackupCancel()">Вернуться</button>
 			</div>
+			<div id="fixcross" class="action">
+				Границы региона <span id="fc_sel"></span> будут поправлены, чтобы включать в себя подсвеченные красным линии.
+				Кликайте на линии, чтобы изменять их статус.<br>
+				<br>
+				<button onclick="bFixCrossPreview()">Посмотреть, что получится</button><br>
+				<div id="fc_do">
+					<button onclick="bFixCrossDo()">Включить линии в контур</button>
+				</div>
+				<button onclick="bFixCrossCancel()">Вернуться</button>
+			</div>
 		</div>
 		<div id="map"></div>
 	</body>

www/lib/leaflet.css

@@ -21,6 +21,7 @@
 .leaflet-container {
 	overflow: hidden;
 	-ms-touch-action: none;
+	touch-action: none;
 	}
 .leaflet-tile,
 .leaflet-marker-icon,

www/lib/leaflet.draw.css

@@ -1,303 +0,0 @@
-/* ================================================================== */
-/* Toolbars
-/* ================================================================== */
-
-.leaflet-draw-section {
-	position: relative;
-}
-
-.leaflet-draw-toolbar {
-	margin-top: 12px;
-}
-
-.leaflet-draw-toolbar-top {
-	margin-top: 0;
-}
-
-.leaflet-draw-toolbar-notop a:first-child {
-	border-top-right-radius: 0;
-}
-
-.leaflet-draw-toolbar-nobottom a:last-child {
-	border-bottom-right-radius: 0;
-}
-
-.leaflet-draw-toolbar a {
-	background-image: url('images/spritesheet.png');
-	background-repeat: no-repeat;
-}
-
-.leaflet-retina .leaflet-draw-toolbar a {
-	background-image: url('images/spritesheet-2x.png');
-	background-size: 270px 30px;
-}
-
-.leaflet-draw a {
-	display: block;
-	text-align: center;
-	text-decoration: none;
-}
-
-/* ================================================================== */
-/* Toolbar actions menu
-/* ================================================================== */
-
-.leaflet-draw-actions {
-	display: none;
-	list-style: none;
-	margin: 0;
-	padding: 0;
-	position: absolute;
-	left: 26px; /* leaflet-draw-toolbar.left + leaflet-draw-toolbar.width */
-	top: 0;
-	white-space: nowrap;
-}
-
-.leaflet-touch .leaflet-draw-actions {
-	left: 32px;
-}
-
-.leaflet-right .leaflet-draw-actions {
-	right:26px;
-	left:auto;
-}
-
-.leaflet-touch .leaflet-right .leaflet-draw-actions {
-	right:32px;
-	left:auto;
-}
-
-.leaflet-draw-actions li {
-	display: inline-block;
-}
-
-.leaflet-draw-actions li:first-child a {
-	border-left: none;
-}
-
-.leaflet-draw-actions li:last-child a {
-	-webkit-border-radius: 0 4px 4px 0;
-	        border-radius: 0 4px 4px 0;
-}
-
-.leaflet-right .leaflet-draw-actions li:last-child a {
-	-webkit-border-radius: 0;
-	        border-radius: 0;
-}
-
-.leaflet-right .leaflet-draw-actions li:first-child a {
-	-webkit-border-radius: 4px 0 0 4px;
-	        border-radius: 4px 0 0 4px;
-}
-
-.leaflet-draw-actions a {
-	background-color: #919187;
-	border-left: 1px solid #AAA;
-	color: #FFF;
-	font: 11px/19px "Helvetica Neue", Arial, Helvetica, sans-serif;
-	line-height: 28px;
-	text-decoration: none;
-	padding-left: 10px;
-	padding-right: 10px;
-	height: 28px;
-}
-
-.leaflet-touch .leaflet-draw-actions a {
-	font-size: 12px;
-	line-height: 30px;
-	height: 30px;
-}
-
-.leaflet-draw-actions-bottom {
-	margin-top: 0;
-}
-
-.leaflet-draw-actions-top {
-	margin-top: 1px;
-}
-
-.leaflet-draw-actions-top a,
-.leaflet-draw-actions-bottom a {
-	height: 27px;
-	line-height: 27px;
-}
-
-.leaflet-draw-actions a:hover {
-	background-color: #A0A098;
-}
-
-.leaflet-draw-actions-top.leaflet-draw-actions-bottom a {
-	height: 26px;
-	line-height: 26px;
-}
-
-/* ================================================================== */
-/* Draw toolbar
-/* ================================================================== */
-
-.leaflet-draw-toolbar .leaflet-draw-draw-polyline {
-	background-position: -2px -2px;
-}
-
-.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-polyline {
-	background-position: 0 -1px;
-}
-
-.leaflet-draw-toolbar .leaflet-draw-draw-polygon {
-	background-position: -31px -2px;
-}
-
-.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-polygon {
-	background-position: -29px -1px;
-}
-
-.leaflet-draw-toolbar .leaflet-draw-draw-rectangle {
-	background-position: -62px -2px;
-}
-
-.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-rectangle {
-	background-position: -60px -1px;
-}
-
-.leaflet-draw-toolbar .leaflet-draw-draw-circle {
-	background-position: -92px -2px;
-}
-
-.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-circle {
-	background-position: -90px -1px;
-}
-
-.leaflet-draw-toolbar .leaflet-draw-draw-marker {
-	background-position: -122px -2px;
-}
-
-.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-draw-marker {
-	background-position: -120px -1px;
-}
-
-/* ================================================================== */
-/* Edit toolbar
-/* ================================================================== */
-
-.leaflet-draw-toolbar .leaflet-draw-edit-edit {
-	background-position: -152px -2px;
-}
-
-.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-edit-edit {
-	background-position: -150px -1px;
-}
-
-.leaflet-draw-toolbar .leaflet-draw-edit-remove {
-	background-position: -182px -2px;
-}
-
-.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-edit-remove {
-	background-position: -180px -1px;
-}
-
-.leaflet-draw-toolbar .leaflet-draw-edit-edit.leaflet-disabled {
-	background-position: -212px -2px;
-}
-
-.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-edit-edit.leaflet-disabled {
-	background-position: -210px -1px;
-}
-
-.leaflet-draw-toolbar .leaflet-draw-edit-remove.leaflet-disabled {
-	background-position: -242px -2px;
-}
-
-.leaflet-touch .leaflet-draw-toolbar .leaflet-draw-edit-remove.leaflet-disabled {
-	background-position: -240px -2px;
-}
-
-/* ================================================================== */
-/* Drawing styles
-/* ================================================================== */
-
-.leaflet-mouse-marker {
-	background-color: #fff;
-	cursor: crosshair;
-}
-
-.leaflet-draw-tooltip {
-	background: rgb(54, 54, 54);
-	background: rgba(0, 0, 0, 0.5);
-	border: 1px solid transparent;
-	-webkit-border-radius: 4px;
-	        border-radius: 4px;
-	color: #fff;
-	font: 12px/18px "Helvetica Neue", Arial, Helvetica, sans-serif;
-	margin-left: 20px;
-	margin-top: -21px;
-	padding: 4px 8px;
-	position: absolute;
-	visibility: hidden;
-	white-space: nowrap;
-	z-index: 6;
-}
-
-.leaflet-draw-tooltip:before {
-	border-right: 6px solid black;
-	border-right-color: rgba(0, 0, 0, 0.5);
-	border-top: 6px solid transparent;
-	border-bottom: 6px solid transparent;
-	content: "";
-	position: absolute;
-	top: 7px;
-	left: -7px;
-}
-
-.leaflet-error-draw-tooltip {
-	background-color: #F2DEDE;
-	border: 1px solid #E6B6BD;
-	color: #B94A48;
-}
-
-.leaflet-error-draw-tooltip:before {
-	border-right-color: #E6B6BD;
-}
-
-.leaflet-draw-tooltip-single {
-	margin-top: -12px
-}
-
-.leaflet-draw-tooltip-subtext {
-	color: #f8d5e4;
-}
-
-.leaflet-draw-guide-dash {
-	font-size: 1%;
-	opacity: 0.6;
-	position: absolute;
-	width: 5px;
-	height: 5px;
-}
-
-/* ================================================================== */
-/* Edit styles
-/* ================================================================== */
-
-.leaflet-edit-marker-selected {
-	background: rgba(254, 87, 161, 0.1);
-	border: 4px dashed rgba(254, 87, 161, 0.6);
-	-webkit-border-radius: 4px;
-	        border-radius: 4px;
-	box-sizing: content-box;
-}
-
-.leaflet-edit-move {
-	cursor: move;
-}
-
-.leaflet-edit-resize {
-	cursor: pointer;
-}
-
-/* ================================================================== */
-/* Old IE styles
-/* ================================================================== */
-
-.leaflet-oldie .leaflet-draw-toolbar {
-	border: 1px solid #999;
-}