4.6.2 release

Change-Id: I33458e534d0f1f43e97a9ac9c156373dfce13fa0
32kda · May 5, 2020 · f68c669 · f68c669
1 parent d296a23
commit f68c669
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,13 +6,27 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [4.6.2]
+
+### Fixed
+- Ability to generate a single tile only
+- Airfields were generated even when Airfields generation was switched off
+- Light strings now have slightly cut ends to avoid lammposts on roads near the road crossings
+- Default road type for wide roads changed to 14 to avoid trees nearthe road
+- Building type computation improved - fixed a typo for `residential` buildings and areas, other small fixes
+
+## [4.6.1]
+
+### Fixed
+- Small fix for Lights UI and defaults
+
 ## [4.6.0]
 
 ### Added
 - Street lights generation for some roads using Object Strings feature
 
 ### Fixed
-- Serious brekdown which led to the multipolygon mlfunction
+- Serious brekdown which led to the multipolygon malfunction
 - UI fixes
 
 ## [4.5.0]

diff --git a/com.osm2xp.application/META-INF/MANIFEST.MF b/com.osm2xp.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Osm2xp
 Bundle-SymbolicName: com.osm2xp.application;singleton:=true
-Bundle-Version: 4.6.0.qualifier
+Bundle-Version: 4.6.2.qualifier
 Bundle-ClassPath: .,
  staticlib/commons-collections-3.2.1.jar,
  staticlib/commons-compress-1.0.jar,

diff --git a/com.osm2xp.application/plugin.xml b/com.osm2xp.application/plugin.xml
@@ -754,7 +754,7 @@
          </property>
          <property
                name="aboutText"
-               value="OSM2XP 4.6.0, OpenStreetMap scenery generator for flight Simulators.&#x0A;&#x0A;Copyright (C) 2010-2013  Benjamin Blanchet for Javee software solutions.&#x0A;Copyright (C) 2018  Dmitry Karpenko, OnPositive&#x0A;&#x0A;Contact : osm2xp@gmail.com&#x0A;Project Website : https://github.com/32kda/osm2xp&#x0A;&#x0A;&#x0A;    This program is free software: you can redistribute it and/or modify&#x0A;    it under the terms of the GNU General Public License as published by&#x0A;    the Free Software Foundation, either version 3 of the License, or&#x0A;    (at your option) any later version.&#x0A;&#x0A;    This program is distributed in the hope that it will be useful,&#x0A;    but WITHOUT ANY WARRANTY; without even the implied warranty of&#x0A;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#x0A;    GNU General Public License for more details.&#x0A;&#x0A;    You should have received a copy of the GNU General Public License&#x0A;    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.&#x0A;&#x0A;&#x0A;FreeMem plugin by Markus junginger http://www.junginger.biz/eclipse/freemem.html&#x0A;Osm2world by Tobiass Knerr http://osm2world.org/&#x0A;Icons by Open Icon Library http://http://openiconlibrary.sourceforge.net/">
+               value="OSM2XP 4.6.2, OpenStreetMap scenery generator for flight Simulators.&#x0A;&#x0A;Copyright (C) 2010-2013  Benjamin Blanchet for Javee software solutions.&#x0A;Copyright (C) 2018  Dmitry Karpenko, OnPositive&#x0A;&#x0A;Contact : osm2xp@gmail.com&#x0A;Project Website : https://github.com/32kda/osm2xp&#x0A;&#x0A;&#x0A;    This program is free software: you can redistribute it and/or modify&#x0A;    it under the terms of the GNU General Public License as published by&#x0A;    the Free Software Foundation, either version 3 of the License, or&#x0A;    (at your option) any later version.&#x0A;&#x0A;    This program is distributed in the hope that it will be useful,&#x0A;    but WITHOUT ANY WARRANTY; without even the implied warranty of&#x0A;    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the&#x0A;    GNU General Public License for more details.&#x0A;&#x0A;    You should have received a copy of the GNU General Public License&#x0A;    along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.&#x0A;&#x0A;&#x0A;FreeMem plugin by Markus junginger http://www.junginger.biz/eclipse/freemem.html&#x0A;Osm2world by Tobiass Knerr http://osm2world.org/&#x0A;Icons by Open Icon Library http://http://openiconlibrary.sourceforge.net/">
          </property>
          <property
                name="windowImages"

diff --git a/com.osm2xp.application/pom.xml b/com.osm2xp.application/pom.xml
@@ -12,13 +12,13 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<version>4.6.0-SNAPSHOT</version>
+	<version>4.6.2-SNAPSHOT</version>
 	<artifactId>com.osm2xp.application</artifactId>
 	<name>OSM2XP - Application</name>
 	<parent>
 		<groupId>com.osm2xp</groupId>
 		<artifactId>com.osm2xp.parent</artifactId>
-		<version>4.6.0</version>
+		<version>4.6.2</version>
 		<relativePath>../releng-app/pom.xml</relativePath>
 	</parent>
 

diff --git a/com.osm2xp.classification.core/META-INF/MANIFEST.MF b/com.osm2xp.classification.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core
 Bundle-SymbolicName: com.osm2xp.classification.core
-Bundle-Version: 4.6.0.qualifier
+Bundle-Version: 4.6.2.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
 Automatic-Module-Name: com.onpositive.classification.core

diff --git a/com.osm2xp.classification.core/pom.xml b/com.osm2xp.classification.core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.osm2xp</groupId>
 		<artifactId>com.osm2xp.core.parent</artifactId>
-		<version>4.6.0-SNAPSHOT</version>
+		<version>4.6.2-SNAPSHOT</version>
 		<relativePath>../releng-core</relativePath>
 	</parent>
 

diff --git a/com.osm2xp.classification/pom.xml b/com.osm2xp.classification/pom.xml
@@ -35,7 +35,7 @@
   	<dependency>
   		<groupId>com.osm2xp</groupId>
   		<artifactId>com.osm2xp.classification.core</artifactId>
-  		<version>4.6.0-SNAPSHOT</version>
+  		<version>4.6.2-SNAPSHOT</version>
   	</dependency>
   </dependencies>
 </project>
diff --git a/com.osm2xp.console/pom.xml b/com.osm2xp.console/pom.xml
@@ -3,15 +3,15 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>com.osm2xp.console</artifactId>
-	<version>4.6.0</version>
+	<version>4.6.2</version>
 	<packaging>jar</packaging>
 	<name>console</name>
 	<url>https://sourceforge.net/projects/osm2xp</url>
 
 	<parent>
 		<groupId>com.osm2xp</groupId>
 		<artifactId>com.osm2xp.console.parent</artifactId>
-		<version>4.6.0-SNAPSHOT</version>
+		<version>4.6.2-SNAPSHOT</version>
 		<relativePath>../releng-console</relativePath>
 	</parent>
 
@@ -275,7 +275,7 @@
 		<dependency>
 			<groupId>com.osm2xp</groupId>
 			<artifactId>com.osm2xp.classification.core</artifactId>
-			<version>4.6.0-SNAPSHOT</version>
+			<version>4.6.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 		    <groupId>com.ibm.icu</groupId>

diff --git a/com.osm2xp.core/pom.xml b/com.osm2xp.core/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>com.osm2xp</groupId>
 		<artifactId>com.osm2xp.core.parent</artifactId>
-		<version>4.6.0-SNAPSHOT</version>
+		<version>4.6.2-SNAPSHOT</version>
 		<relativePath>../releng-core</relativePath>
 	</parent>
 

diff --git a/com.osm2xp.core/src/main/java/com/osm2xp/core/constants/CoreConstants.java b/com.osm2xp.core/src/main/java/com/osm2xp/core/constants/CoreConstants.java
@@ -2,6 +2,6 @@
 
 public class CoreConstants {
 
-	public static final String OSM2XP_VERSION = "4.6.0";
+	public static final String OSM2XP_VERSION = "4.6.2";
 
 }
diff --git a/com.osm2xp.generation/pom.xml b/com.osm2xp.generation/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>com.osm2xp</groupId>
 		<artifactId>com.osm2xp.core.parent</artifactId>
-		<version>4.6.0-SNAPSHOT</version>
+		<version>4.6.2-SNAPSHOT</version>
 		<relativePath>../releng-core</relativePath>
 	</parent>
 

diff --git a/com.osm2xp.product/pom.xml b/com.osm2xp.product/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>com.osm2xp</groupId>
 		<artifactId>com.osm2xp.parent</artifactId>
-		<version>4.6.0</version>
+		<version>4.6.2</version>
 		<relativePath>../releng-app/pom.xml</relativePath>
 	</parent>
 

diff --git a/releng-app/pom.xml b/releng-app/pom.xml
@@ -10,7 +10,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.osm2xp.parent</artifactId>
-	<version>4.6.0</version>
+	<version>4.6.2</version>
 	<packaging>pom</packaging>
 	<name>OSM2XP</name>
 	<organization>
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>com.osm2xp</groupId>
   		<artifactId>com.osm2xp.build</artifactId>
-  		<version>4.6.0-SNAPSHOT</version>
+  		<version>4.6.2-SNAPSHOT</version>
 		<relativePath>../releng</relativePath>
 	</parent>
 

diff --git a/releng-console/pom.xml b/releng-console/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.osm2xp</groupId>
   		<artifactId>com.osm2xp.build</artifactId>
-  		<version>4.6.0-SNAPSHOT</version>
+  		<version>4.6.2-SNAPSHOT</version>
 		<relativePath>../releng</relativePath>
 	</parent>
 

diff --git a/releng-core/pom.xml b/releng-core/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.osm2xp</groupId>
   		<artifactId>com.osm2xp.build</artifactId>
-  		<version>4.6.0-SNAPSHOT</version>
+  		<version>4.6.2-SNAPSHOT</version>
 		<relativePath>../releng</relativePath>
 	</parent>
 

diff --git a/releng/pom.xml b/releng/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.osm2xp</groupId>
   <artifactId>com.osm2xp.build</artifactId>
-  <version>4.6.0-SNAPSHOT</version>
+  <version>4.6.2-SNAPSHOT</version>
   <name>OSM2XP-Global</name>  
   <description>Global build parent for osm2xp</description>
   <packaging>pom</packaging>