Changeset 18920 in osm for applications/editors/josm/plugins

Timestamp:

2009-12-03T20:54:46+01:00 (15 years ago)

Author:

guggis

Message:

'Updated to new referrer support in OsmPrimitive'

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (4 diffs)
• src/cadastre_fr/SimplifyWay.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ +1 @@
+<!--
+** This is a template build file for the cadastre-fr plugin.
+**
+** Maintaining versions
+** ====================
+** see README.template
+**
+** Usage
+** =====
+** To build it run
+**
+**    > ant  dist
+**
+** To install the generated plugin locally (in your default plugin directory) run
+**
+**    > ant  install
+**
+** To build against the core in ../../core, create a correct manifest and deploy to
+** SVN, 
+**    set the properties commit.message and plugin.main.version
+** and run
+**    > ant  publish
+**
+**
+-->
 <project name="cadastre-fr" default="dist" basedir=".">
     <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
@@ -5 +30 @@
     <property name="plugin.jar"             value="${plugin.dist.dir}/${ant.project.name}.jar"/>
     <property name="ant.build.javac.target" value="1.5"/>
+        
+        
+
+    <property name="commit.message" value="Updated to new referrer support in OsmPrimitive" />          
+    <property name="plugin.main.version" value="2565" />
+        
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
@@ -26 +57 @@
                 <attribute name="Plugin-Description" value="A special handler for the French land registry WMS server."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/Cadastre"/>
-                <attribute name="Plugin-Mainversion" value="2509"/>
+                <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                 <attribute name="Plugin-Stage" value="60"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
@@ -55 +86 @@
         <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
     </target>
+        
+        <!--
+                 ************************** Publishing the plugin *********************************** 
+                -->
+                        <!--
+                          ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+                          ** property ${coreversion.info.entry.revision}
+                          **
+                        -->
+                        <target name="core-info">
+                        <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false">
+                                    <env key="LANG" value="C"/>
+                                    <arg value="info"/>
+                                    <arg value="--xml"/>
+                                    <arg value="../../core"/>
+                        </exec>
+                        <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/>
+                                <echo>Building against core revision ${coreversion.info.entry.revision}.</echo>                 
+                                <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo>
+                                <delete file="core.info.xml" />
+                        </target>
+
+                        <!--
+                         ** commits the source tree for this plugin
+                        -->
+                        <target name="commit-current">
+                                <echo>Commiting the plugin source with message '${commit.message}' ...</echo>
+                            <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+                                            <env key="LANG" value="C"/>
+                                            <arg value="commit"/>
+                                            <arg value="-m '${commit.message}'"/>
+                                            <arg value="."/>
+                            </exec>         
+                        </target>
+
+                        <!--
+                        ** updates (svn up) the source tree for this plugin
+                        -->
+                        <target name="update-current">
+                                <echo>Updating plugin source ...</echo>
+                            <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+                                            <env key="LANG" value="C"/>
+                                            <arg value="up"/>
+                                            <arg value="."/>
+                            </exec>         
+                                <echo>Updating ${plugin.jar} ...</echo>
+                            <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+                                            <env key="LANG" value="C"/>
+                                            <arg value="up"/>
+                                            <arg value="../dist/${plugin.jar}"/>
+                            </exec>         
+                        </target>
+                        
+                        <!--
+                         ** commits the plugin.jar 
+                         -->
+                        <target name="commit-dist">
+                                        <echo>
+        ***** Properties of published ${plugin.jar} *****
+        Commit message    : '${commit.message}'                                 
+        Plugin-Mainversion: ${plugin.main.version}
+        JOSM build version: ${coreversion.info.entry.revision}
+        Plugin-Version    : ${version.entry.commit.revision}
+        ***** / Properties of published ${plugin.jar} *****                                     
+                                                
+        Now commiting ${plugin.jar} ...
+        </echo>                                 
+                                    <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">
+                                                    <env key="LANG" value="C"/>
+                                                                <arg value="-m '${commit.message}'"/>
+                                                                <arg value="commit"/>                                           
+                                                <arg value="${plugin.jar}"/>
+                                    </exec>         
+                        </target>
+                                        
+                        <target name="publish" depends="core-info,commit-current,update-current,clean,dist,commit-dist">
+                        </target>
 </project>

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java

@@ -9 +9 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import org.openstreetmap.josm.Main;
@@ -17 +18 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -33 +34 @@
 
         int toI = wnew.getNodesCount() - 1;
+        List<OsmPrimitive> parents = new ArrayList<OsmPrimitive>();
         for (int i = wnew.getNodesCount() - 1; i >= 0; i--) {
-            CollectBackReferencesVisitor backRefsV = new CollectBackReferencesVisitor(dataSet, false);
-            backRefsV.visit(wnew.getNode(i));
+            //CollectBackReferencesVisitor backRefsV = new CollectBackReferencesVisitor(dataSet, false);
+            //backRefsV.visit(wnew.getNode(i));
+           parents.addAll(w.getNode(i).getReferrers());
             boolean used = false;
-            if (backRefsV.getData().size() == 1) {
+            if (parents.size() == 1) {
                 used = Collections.frequency(w.getNodes(), wnew.getNode(i)) > 1;
             } else {
-                backRefsV.getData().remove(w);
-                used = !backRefsV.getData().isEmpty();
+                //backRefsV.getData().remove(w);
+                parents.remove(w);
+                used = !parents.isEmpty();
             }
             if (!used)