From b53691f78b48b4dad5e8c9e979bc4de0a17a52fe Mon Sep 17 00:00:00 2001
From: duminil <duminil@2c044af0-2e85-064f-a0c3-7471430cffcd>
Date: Fri, 21 Apr 2017 13:11:23 +0000
Subject: [PATCH] Moving stuff
---
src/eu/simstadt/regionchooser/RegionExtractor.java | 4 ++--
.../citygml_parser}/BuildingXmlNode.java | 2 +-
.../citygml_parser}/CityGmlIterator.java | 7 +++----
3 files changed, 6 insertions(+), 7 deletions(-)
rename src/eu/simstadt/{lowlevelgmlparser => regionchooser/citygml_parser}/BuildingXmlNode.java (97%)
rename src/eu/simstadt/{lowlevelgmlparser => regionchooser/citygml_parser}/CityGmlIterator.java (92%)
diff --git a/src/eu/simstadt/regionchooser/RegionExtractor.java b/src/eu/simstadt/regionchooser/RegionExtractor.java
index 1bff19f..aaf9a7c 100644
--- a/src/eu/simstadt/regionchooser/RegionExtractor.java
+++ b/src/eu/simstadt/regionchooser/RegionExtractor.java
@@ -12,8 +12,8 @@
import com.ximpleware.NavException;
import com.ximpleware.XPathEvalException;
import com.ximpleware.XPathParseException;
-import eu.simstadt.lowlevelgmlparser.BuildingXmlNode;
-import eu.simstadt.lowlevelgmlparser.CityGmlIterator;
+import eu.simstadt.regionchooser.citygml_parser.BuildingXmlNode;
+import eu.simstadt.regionchooser.citygml_parser.CityGmlIterator;
public class RegionExtractor
diff --git a/src/eu/simstadt/lowlevelgmlparser/BuildingXmlNode.java b/src/eu/simstadt/regionchooser/citygml_parser/BuildingXmlNode.java
similarity index 97%
rename from src/eu/simstadt/lowlevelgmlparser/BuildingXmlNode.java
rename to src/eu/simstadt/regionchooser/citygml_parser/BuildingXmlNode.java
index 791cc71..d19ad0c 100644
--- a/src/eu/simstadt/lowlevelgmlparser/BuildingXmlNode.java
+++ b/src/eu/simstadt/regionchooser/citygml_parser/BuildingXmlNode.java
@@ -1,4 +1,4 @@
-package eu.simstadt.lowlevelgmlparser;
+package eu.simstadt.regionchooser.citygml_parser;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.GeometryFactory;
diff --git a/src/eu/simstadt/lowlevelgmlparser/CityGmlIterator.java b/src/eu/simstadt/regionchooser/citygml_parser/CityGmlIterator.java
similarity index 92%
rename from src/eu/simstadt/lowlevelgmlparser/CityGmlIterator.java
rename to src/eu/simstadt/regionchooser/citygml_parser/CityGmlIterator.java
index d38f75c..70b398d 100644
--- a/src/eu/simstadt/lowlevelgmlparser/CityGmlIterator.java
+++ b/src/eu/simstadt/regionchooser/citygml_parser/CityGmlIterator.java
@@ -1,4 +1,4 @@
-package eu.simstadt.lowlevelgmlparser;
+package eu.simstadt.regionchooser.citygml_parser;
import java.io.IOException;
import java.nio.file.Files;
@@ -20,7 +20,6 @@ public class CityGmlIterator implements Iterable<BuildingXmlNode>
private AutoPilot buildingsFinder;
private VTDNav navigator;
- private long offsetAndLength;
private int buildingOffset = 0;
private int buildingLength = 0;
private Path citygmlPath;
@@ -28,7 +27,7 @@ public class CityGmlIterator implements Iterable<BuildingXmlNode>
/*
* Simple class to parse a CityGML and extract cityObjectMember XML nodes and their coordinates. Since the
* coordinates are extracted for RegionChooser, it's okay to not be perfectly robust, but it should be fast and not
- * use much memory.
+ * use much memory. A SaxParser would use even less memory but might be harder to code and slower to run.
*
* Based on VTD XML, it provides a Building iterator.
*
@@ -60,7 +59,7 @@ public boolean hasNext() {
@Override
public BuildingXmlNode next() {
try {
- offsetAndLength = navigator.getElementFragment();
+ long offsetAndLength = navigator.getElementFragment();
buildingOffset = (int) offsetAndLength;
buildingLength = (int) (offsetAndLength >> 32);
return new BuildingXmlNode(navigator, buildingOffset, buildingLength);
--
GitLab