Merge branch 'master' of github.com:B3Partners/brmo

B3Partners · Nov 27, 2017 · 8c466b7 · 8c466b7
2 parents e93b603 + 302c841
commit 8c466b7
Show file tree

Hide file tree

Showing 12 changed files with 1,324 additions and 1,409 deletions.
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,16 @@
+### Probleem
+XXXXXXX
+
+### Versie
+versie info: <!-- ga naar http://<server:poort>/brmo-service/about.jsp en kopier/plak -->
+
+### Server log
+<details><summary>server log:</summary>
+
+```
+
+DUBBELCLICK_en_PLAK_hier_stacktrace
+
+```
+
+</details>
diff --git a/brmo-service/pom.xml b/brmo-service/pom.xml
@@ -118,10 +118,6 @@
             <groupId>org.geotools</groupId>
             <artifactId>gt-main</artifactId>
         </dependency>
-        <dependency>
-            <groupId>nl.b3p</groupId>
-            <artifactId>topnlparser</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -186,6 +186,11 @@
                 <artifactId>gt-epsg-hsql</artifactId>
                 <version>${geotools.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hsqldb</groupId>
+                <artifactId>hsqldb</artifactId>
+                <version>${test.hsqldb.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.geotools.xsd</groupId>
                 <artifactId>gt-xsd-gml3</artifactId>
@@ -386,12 +391,6 @@
                 <version>${test.h2.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.hsqldb</groupId>
-                <artifactId>hsqldb</artifactId>
-                <version>${test.hsqldb.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>

diff --git a/topparser/pom.xml b/topparser/pom.xml
@@ -80,7 +80,6 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>

diff --git a/topparser/src/main/java/nl/b3p/topnl/Main.java b/topparser/src/main/java/nl/b3p/topnl/Main.java
@@ -41,21 +41,22 @@ public class Main {
 
     public static void main (String[] args) throws IOException, JAXBException, ParseException, SQLException, JDOMException{
         try {
-           /* BasicDataSource ds = new BasicDataSource();
-            ds.setUrl("jdbc:postgresql://localhost:5432/rsgb_topnl");
+            BasicDataSource ds = new BasicDataSource();
+            ds.setUrl("jdbc:postgresql://localhost:5432/topnl");
             ds.setDriverClassName("org.postgresql.Driver");
             ds.setUsername("rsgb");
-            ds.setPassword("rsgb");*/
+            ds.setPassword("rsgb");
 
-            BasicDataSource ds = new BasicDataSource();
+           /* BasicDataSource ds = new BasicDataSource();
             ds.setUrl("jdbc:oracle:thin:@b3p-demoserver:1521/ORCL");
             ds.setDriverClassName("oracle.jdbc.driver.OracleDriver");
             ds.setUsername("top50nl");
-            ds.setPassword("top50nl");
+            ds.setPassword("top50nl");*/
             Processor p = new Processor(ds);
          //   loadtopnl("/mnt/data/Documents/TopNL/Top50NL/TOP50NL_GML_Filechunks_november_2016/TOP50NL_GML_Filechunks", p,  TopNLType.TOP50NL);
             //loadtopnl("/mnt/data/Documents/TopNL/Top10NL/TOP10NL_GML_Filechuncks_november_2016/TOP10NL_GML_Filechuncks", p,  TopNLType.TOP10NL);
-            loadtopnl("/mnt/data/Documents/TopNL/TOP100NL_GML_Filechunks_november_2016/TOP100NL_GML_Filechunks", p,  TopNLType.TOP100NL);
+            loadtopnl("/mnt/data/Documents/TopNL/Tynaarlo/Top10NL", p,  TopNLType.TOP10NL);
+            //loadtopnl("/mnt/data/Documents/TopNL/TOP100NL_GML_Filechunks_november_2016/TOP100NL_GML_Filechunks", p,  TopNLType.TOP100NL);
             //process("top250NL.gml", p);
             //process("Hoogte_top250nl.xml", TopNLType.TOP250NL, p);
             //process("Hoogte_top100nl.xml", TopNLType.TOP100NL, p);

diff --git a/topparser/src/main/java/nl/b3p/topnl/Processor.java b/topparser/src/main/java/nl/b3p/topnl/Processor.java
@@ -86,7 +86,7 @@ public void importIntoDb(URL in, TopNLType type) throws JDOMException {
                             list.add(obj);
                             List<TopNLEntity> entities = convert(list, type);
                             save(entities, type);
-                        } catch (JAXBException | IOException | SAXException | ParserConfigurationException | TransformerException | ParseException ex) {
+                        } catch (JAXBException | IOException | SAXException | ParserConfigurationException | TransformerException | ParseException | IllegalArgumentException ex) {
                             log.error("Error parsing", ex);
                         } catch (ClassCastException cce) {
                             log.error(String.format(Locale.ROOT, "Verwerkingsfout van element %s locatie %s", localname, (jb == null ? "onbekend" : ll.getLocation(jb))), cce);

diff --git a/topparser/src/main/java/nl/b3p/topnl/converters/Converter.java b/topparser/src/main/java/nl/b3p/topnl/converters/Converter.java
@@ -46,7 +46,7 @@ public abstract class Converter {
 
     public abstract List<TopNLEntity> convert(List jaxbObjects)  throws IOException, SAXException, ParserConfigurationException, TransformerException;
 
-    public abstract TopNLEntity convertObject(Object jaxbObject)  throws IOException, SAXException, ParserConfigurationException, TransformerException;
+    public abstract TopNLEntity convertObject(Object jaxbObject)  throws IOException, SAXException, ParserConfigurationException, TransformerException,IllegalArgumentException;
 
     public abstract List<TopNLEntity> convertFeatureCollection(List jaxbObject)  throws IOException, SAXException, ParserConfigurationException, TransformerException;
 

diff --git a/topparser/src/main/java/nl/b3p/topnl/converters/Top10NLConverter.java b/topparser/src/main/java/nl/b3p/topnl/converters/Top10NLConverter.java
@@ -53,6 +53,7 @@
 import nl.b3p.topnl.top10nl.TerreinType;
 import nl.b3p.topnl.top10nl.GeografischGebiedType;
 import nl.b3p.topnl.top10nl.InrichtingselementType;
+import nl.b3p.topnl.top10nl.PlaatsType;
 import nl.b3p.topnl.top10nl.PlanTopografieType;
 import nl.b3p.topnl.top10nl.ReliefType;
 import nl.b3p.topnl.top10nl.Top10NlObjectType;
@@ -99,7 +100,7 @@ public List<TopNLEntity> convertFeatureCollection(List jaxbFeatureCollection) th
     }
 
     @Override
-    public TopNLEntity convertObject(Object featureMember) throws IOException, SAXException, ParserConfigurationException, TransformerException {
+    public TopNLEntity convertObject(Object featureMember) throws IOException, SAXException, ParserConfigurationException, TransformerException,IllegalArgumentException {
         TopNLEntity entity = null;
 
          if(featureMember instanceof FeatureMemberType){
@@ -116,8 +117,8 @@ public TopNLEntity convertObject(Object featureMember) throws IOException, SAXEx
             entity = convertGeografischGebied(featureMember);
         } else if (featureMember instanceof InrichtingselementType) {
             entity = convertInrichtingselement(featureMember);
-       /* } else if (featureMember instanceof PlaatsType) {
-            entity = convertPlaats(featureMember);*/
+        } else if (featureMember instanceof PlaatsType) {
+            entity = convertPlaats(featureMember);
         } else if (featureMember instanceof RegistratiefGebiedType) {
             entity = convertRegistratiefGebied(featureMember);
         } else if (featureMember instanceof ReliefType) {
@@ -245,7 +246,19 @@ public Inrichtingselement convertInrichtingselement(Object jaxbObject) throws IO
 
     @Override
     public Plaats convertPlaats(Object jaxbObject) throws IOException, SAXException, ParserConfigurationException, TransformerException {
-        throw new IllegalArgumentException("Plaats does not exist in Top10NL");
+        PlaatsType p = (PlaatsType) jaxbObject;
+
+        Plaats pl = new Plaats();
+        convertTop10NlObjectType(p, pl);
+
+        pl.setGeometrie(gc.convertGeometry(p.getGeometrie()));
+
+        pl.setAantalInwoners(p.getAantalinwoners() != null ? p.getAantalinwoners().longValue() : null);
+        pl.setNaamFries(p.getNaamFries());
+        pl.setNaamNL(p.getNaamNL());
+        pl.setNaamOfficieel(p.getNaamOfficieel());
+        pl.setTypeGebied(p.getTypeGebied().getValue());
+        return pl;
     }
 
     @Override
@@ -436,7 +449,7 @@ public Wegdeel convertWegdeel(Object jaxbObject) throws IOException, SAXExceptio
         }
         rg.setTypeInfrastructuur(r.getTypeInfrastructuur() != null ? r.getTypeInfrastructuur().getValue() : null);
         rg.setVerhardingstype(r.getVerhardingstype().getValue());
-        rg.setVerhardingsbreedteklasse(r.getVerhardingsbreedteklasse().getValue());
+        rg.setVerhardingsbreedteklasse(r.getVerhardingsbreedteklasse() != null ? r.getVerhardingsbreedteklasse().getValue() : null);
         rg.setGescheidenRijbaan(r.getGescheidenRijbaan() ==BRTJaNeeWaardeType.JA);
         rg.setaWegnummer(String.join(",", r.getAWegnummer()));
         rg.setnWegnummer(String.join(",", r.getNWegnummer()));