From a49211f84bdd0fda822dbb65bc0a2dc7606100c1 Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Thu, 11 Oct 2018 09:20:27 +0200
Subject: [PATCH] RegionChooser: Adding "EPSG:25833"

---
 src/eu/simstadt/regionchooser/RegionChooserFX.java        | 8 ++------
 .../regionchooser/website/script/simstadt_openlayers.js   | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/eu/simstadt/regionchooser/RegionChooserFX.java b/src/eu/simstadt/regionchooser/RegionChooserFX.java
index ff423fb..3a83b91 100644
--- a/src/eu/simstadt/regionchooser/RegionChooserFX.java
+++ b/src/eu/simstadt/regionchooser/RegionChooserFX.java
@@ -1,5 +1,6 @@
 package eu.simstadt.regionchooser;
 
+import java.util.Objects;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
@@ -31,12 +32,7 @@ public static void main(String[] args) {
 
 	private String applicationVersion() {
 		Package simstadtJar = RegionChooserFX.class.getPackage();
-		String implementationVersion = simstadtJar.getImplementationVersion();
-		if (implementationVersion != null) {
-			return implementationVersion;
-		} else {
-			return "development version";
-		}
+		return Objects.toString(simstadtJar.getImplementationVersion(), "development version");
 	}
 }
 
diff --git a/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js b/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
index dee94c6..3e54a98 100644
--- a/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
+++ b/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
@@ -9,6 +9,7 @@ proj4.defs("EPSG:2263", "+proj=lcc +lat_1=41.03333333333333 +lat_2=40.6666666666
 //NOTE: Proj4 string for 28992 is wrong at http://spatialreference.org/ref/epsg/amersfoort-rd-new/
 //NOTE: Corrected version from https://oegeo.wordpress.com/2008/05/20/note-to-self-the-one-and-only-rd-projection-string/
 proj4.defs("EPSG:25832", "+proj=utm +zone=32 +ellps=GRS80 +units=m +no_defs "); // http://spatialreference.org/ref/epsg/etrs89-utm-zone-32n/proj4/
+proj4.defs("EPSG:25833", "+proj=utm +zone=33 +ellps=GRS80 +units=m +no_defs "); // http://spatialreference.org/ref/epsg/etrs89-utm-zone-33n/proj4/
 proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.999908 +x_0=155000 +y_0=463000 +ellps=bessel +units=m +towgs84=565.2369,50.0087,465.658,-0.406857330322398,0.350732676542563,-1.8703473836068,4.0812 +no_defs <>"); // 
 
 var regionChooser = (function(){
-- 
GitLab