Changeset 18924 in osm
- Timestamp:
- 2009-12-03T20:59:47+01:00 (15 years ago)
- Location:
- applications/editors/josm/plugins/terracer
- Files:
-
- 2 edited
-
build.xml (modified) (4 diffs)
-
src/terracer/ReverseTerraceAction.java (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/terracer/build.xml
r17874 r18924 1 <!-- 2 ** This is a template build file for the terracer plugin 3 ** 4 ** Maintaining versions 5 ** ==================== 6 ** see README.template 7 ** 8 ** Usage 9 ** ===== 10 ** To build it run 11 ** 12 ** > ant dist 13 ** 14 ** To install the generated plugin locally (in your default plugin directory) run 15 ** 16 ** > ant install 17 ** 18 ** To build against the core in ../../core, create a correct manifest and deploy to 19 ** SVN, 20 ** set the properties commit.message and plugin.main.version 21 ** and run 22 ** > ant publish 23 ** 24 ** 25 --> 1 26 <project name="terracer" default="dist" basedir="."> 2 27 <property name="josm" location="../../core/dist/josm-custom.jar"/> … … 5 30 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/> 6 31 <property name="ant.build.javac.target" value="1.5"/> 32 33 34 <property name="commit.message" value="Updated to new referrer support in OsmPrimitive" /> 35 <property name="plugin.main.version" value="2565" /> 36 37 7 38 <target name="init"> 8 39 <mkdir dir="${plugin.build.dir}"/> … … 26 57 <attribute name="Plugin-Description" value="Make terraced houses out of single blocks."/> 27 58 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/Terracer"/> 28 <attribute name="Plugin-Mainversion" value=" 2219"/>59 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/> 29 60 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/> 30 61 </manifest> … … 54 85 <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/> 55 86 </target> 87 88 <!-- 89 ************************** Publishing the plugin *********************************** 90 --> 91 <!-- 92 ** extracts the JOSM release for the JOSM version in ../core and saves it in the 93 ** property ${coreversion.info.entry.revision} 94 ** 95 --> 96 <target name="core-info"> 97 <exec append="false" output="core.info.xml" executable="svn" failifexecutionfails="false"> 98 <env key="LANG" value="C"/> 99 <arg value="info"/> 100 <arg value="--xml"/> 101 <arg value="../../core"/> 102 </exec> 103 <xmlproperty file="core.info.xml" prefix="coreversion" keepRoot="true" collapseAttributes="true"/> 104 <echo>Building against core revision ${coreversion.info.entry.revision}.</echo> 105 <echo>Plugin-Mainversion is set to ${plugin.main.version}.</echo> 106 <delete file="core.info.xml" /> 107 </target> 108 109 <!-- 110 ** commits the source tree for this plugin 111 --> 112 <target name="commit-current"> 113 <echo>Commiting the plugin source with message '${commit.message}' ...</echo> 114 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 115 <env key="LANG" value="C"/> 116 <arg value="commit"/> 117 <arg value="-m '${commit.message}'"/> 118 <arg value="."/> 119 </exec> 120 </target> 121 122 <!-- 123 ** updates (svn up) the source tree for this plugin 124 --> 125 <target name="update-current"> 126 <echo>Updating plugin source ...</echo> 127 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 128 <env key="LANG" value="C"/> 129 <arg value="up"/> 130 <arg value="."/> 131 </exec> 132 <echo>Updating ${plugin.jar} ...</echo> 133 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 134 <env key="LANG" value="C"/> 135 <arg value="up"/> 136 <arg value="../dist/${plugin.jar}"/> 137 </exec> 138 </target> 139 140 <!-- 141 ** commits the plugin.jar 142 --> 143 <target name="commit-dist"> 144 <echo> 145 ***** Properties of published ${plugin.jar} ***** 146 Commit message : '${commit.message}' 147 Plugin-Mainversion: ${plugin.main.version} 148 JOSM build version: ${coreversion.info.entry.revision} 149 Plugin-Version : ${version.entry.commit.revision} 150 ***** / Properties of published ${plugin.jar} ***** 151 152 Now commiting ${plugin.jar} ... 153 </echo> 154 <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false"> 155 <env key="LANG" value="C"/> 156 <arg value="-m '${commit.message}'"/> 157 <arg value="commit"/> 158 <arg value="${plugin.jar}"/> 159 </exec> 160 </target> 161 162 <target name="publish" depends="core-info,commit-current,update-current,clean,dist,commit-dist"> 163 </target> 56 164 </project> -
applications/editors/josm/plugins/terracer/src/terracer/ReverseTerraceAction.java
r17707 r18924 17 17 import org.openstreetmap.josm.data.osm.OsmPrimitive; 18 18 import org.openstreetmap.josm.data.osm.Way; 19 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;20 19 import org.openstreetmap.josm.tools.Shortcut; 21 20 … … 84 83 for (Node n : w.getNodes()) { 85 84 if (!visitedNodes.contains(n)) { 86 CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet()); 87 v.visit(n); 88 for (OsmPrimitive prim : v.getData()) { 85 for (OsmPrimitive prim : n.getReferrers()) { 89 86 if (prim.keySet().contains("building") && prim instanceof Way) { 90 87 front.add((Way)prim);
Note:
See TracChangeset
for help on using the changeset viewer.
