Changes between Version 12 and Version 13 of Help/Plugin/Scripting/Python

Timestamp:

2017-10-09T17:56:51+02:00 (7 years ago)

Author:

Polyglot

Comment:

removed mapView from the other scripts as well

Help/Plugin/Scripting/Python

@@ -3 +3 @@
 Some more examples in Python:
 
-Export a collection of routes to Garmin GPX file:
+Export a collection of routes to Garmin GPX file (not a super example, as I don't think we do collection relations anymore):
 
 
@@ -10 +10 @@
 '''
 RWN2Garmin.py  - Numbered networks to Garmin GPX file converter
-This code is released under the GNU General
-Public License v2 or later.
+This code is released under the GNU General Public License v2 or later.
 
 The GPL v3 is accessible here:
 http://www.gnu.org/licenses/gpl.html
 
-The GPL v2 is accessible here:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-
 It comes with no warranty whatsoever.
-
-This code illustrates how to use Jython to:
-* work with selected items or how to process all the primitives of a certain kind (node, way, relation)
-
 '''
 from javax.swing import JOptionPane, JDialog
@@ -35 +27 @@
 import time
 
-def getMapView():
-    if Main.main and Main.main.map:
-        return Main.main.map.mapView
-    else:
-        return None
-
-mv = getMapView()
 f = open('C:/export.gpx', 'w')
 f.write('<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n')
 f.write('<gpx xmlns="http://www.topografix.com/GPX/1/1" creator="OSM Route Manager" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">\n')
 f.write('<!-- All data by OpenStreetMap, licensed under cc-by-sa-2.0 (http://creativecommons.org/licenses/by-sa/2.0/). -->\n')
-if mv and mv.editLayer and mv.editLayer.data:
-    #selectedNodes = mv.editLayer.data.getSelectedNodes()
-    #selectedWays = mv.editLayer.data.getSelectedWays()
+
+editLayer = Main.getLayerManager().getEditLayer()
+if editLayer and editLayer.data:
     selectedRelations = mv.editLayer.data.getSelectedRelations()
 
@@ -54 +39 @@
         JOptionPane.showMessageDialog(Main.parent, "Please select a collection relation")
     else:
-        # nodetype = Node().getType()
         print
         for collection in selectedRelations:
@@ -389 +373 @@
 
 {{{#!python
-
 #!/bin/jython
 
@@ -401 +384 @@
 http://www.gnu.org/licenses/gpl.html
 
-The GPL v2 is accessible here:
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-
 It comes with no warranty whatsoever.
 
 This code Loops through selected turn restriction relations, trying to remove ways split from originally the same way (with to / from roles) under turn restriction relations which should no longer remain as members of these relations, as a result of a Potlatch issue: https://trac.openstreetmap.org/ticket/3254
 
-Only work for turn restrictions with one via node
+Only works for turn restrictions with one via node
 
 e.g. Original      : from: Way1, via: Node, to:Way2
@@ -435 +415 @@
 class RestrictionError(Exception):
     pass
-
-def getMapView():
-    if Main.main and Main.main.map:
-        return Main.main.map.mapView
-    else:
-        return None
 
 def getMembers (restriction):
@@ -577 +551 @@
     
 validrestrictiontypes = ('only_straight_on', 'only_right_turn', 'only_left_turn', 'no_right_turn', 'no_left_turn', 'no_straight_on', 'no_u_turn')
-mv = getMapView()
-if mv and mv.editLayer and mv.editLayer.data:
-    selectedRelations = mv.editLayer.data.getSelectedRelations()
+editLayer = Main.getLayerManager().getEditLayer()
+if editLayer and editLayer.data:
+    selectedRelations = editLayer.data.getSelectedRelations()
    
     if not(selectedRelations):
@@ -588 +562 @@
             if relation.get('type') == "restriction" and relation.get('restriction') in validrestrictiontypes:
                 try:
-                    memberlist = getMembers (relation)      
-                    #print "".join(v * len(memberlist[v]) for v in memberlist.keys())           
+                    memberlist = getMembers (relation)
                     if (len (memberlist["from"])) > 1 or (len (memberlist["to"])) > 1 :
                         # Repair attempt