Commit 9aadade9 authored by Martin Raifer's avatar Martin Raifer
Browse files

Merge branch 'update-parent' into 'master'

Update parent

See merge request !5
parents ddf99a48 8b47e2c5
# Based on https://gitignore.io/api/intellij+all,eclipse,vim,emacs,java,maven,neatbeans only changed .idea/ to .idea/* and added custom stuff on the bottom
# Created by https://www.toptal.com/developers/gitignore/api/intellij+all,eclipse,vim,emacs,java,maven,netbeans
# Edit at https://www.toptal.com/developers/gitignore?templates=intellij+all,eclipse,vim,emacs,java,maven,netbeans
### Eclipse ###
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.settings/
.loadpath
.recommenders
# External tool builders
.externalToolBuilders/
# Locally stored "Eclipse launch configurations"
*.launch
# PyDev specific (Python IDE for Eclipse)
*.pydevproject
# CDT-specific (C/C++ Development Tooling)
.cproject
# CDT- autotools
.autotools
# Java annotation processor (APT)
.factorypath
# PDT-specific (PHP Development Tools)
.buildpath
# sbteclipse plugin
.target
# Tern plugin
.tern-project
# TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans
# Code Recommenders
.recommenders/
# Annotation Processing
.apt_generated/
# Scala IDE specific (Scala & Java development for Eclipse)
.cache-main
.scala_dependencies
.worksheet
### Eclipse Patch ###
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath
# Annotation Processing
.apt_generated
.sts4-cache/
### Emacs ###
# -*- mode: gitignore; -*-
*~
\#*\#
/.emacs.desktop
/.emacs.desktop.lock
*.elc
auto-save-list
tramp
.\#*
# Org-mode
.org-id-locations
*_archive
# flymake-mode
*_flymake.*
# eshell files
/eshell/history
/eshell/lastdir
# elpa packages
/elpa/
# reftex files
*.rel
# AUCTeX auto folder
/auto/
# cask packages
.cask/
dist/
# Flycheck
flycheck_*.el
# server auth directory
/server/
# projectiles files
.projectile
# directory configuration
.dir-locals.el
# network security
/network-security.data
### Intellij+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
.idea/**/libraries
# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# CMake
cmake-build-*/
# Mongo Explorer plugin
.idea/**/mongoSettings.xml
# File-based project format
*.iws
# IntelliJ
out/
# mpeltonen/sbt-idea plugin
.idea_modules/
# JIRA plugin
atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
# Editor-based Rest Client
.idea/httpRequests
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
### Intellij+all Patch ###
# Ignores the whole .idea folder and all .iml files
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
.idea/*
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
*.iml
modules.xml
.idea/misc.xml
*.ipr
# Sonarlint plugin
.idea/sonarlint
### Java ###
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
......@@ -12,34 +232,60 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# maven generated target folder
**/target/
### Maven ###
target/
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
# eclipse stuff
.project
.classpath
.settings
### NetBeans ###
**/nbproject/private/
**/nbproject/Makefile-*.mk
**/nbproject/Package-*.bash
build/
nbbuild/
nbdist/
.nb-gradle/
### Vim ###
# Swap
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]
# Session
Session.vim
# Temporary
.netrwhist
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~
# End of https://www.toptal.com/developers/gitignore/api/intellij+all,eclipse,vim,emacs,java,maven,netbeans
# intellij stuff
*.iml
.idea
# netbeans stuff
nb-configuration.xml
### custom rules for all projects ###
# track checkstyle version to switch automatically inside of IDEA for older branches
!.idea/checkstyle-idea.xml
# exclude oshdb database files from all projects
*.oshdb.mv.db
# exclude ignite default working directories
/ignite/
# exclude netbeans config files (missing in gitignore.io)
nbactions*.xml
**/nbproject/
# gedit stuff
*~
# DB stuff
temp_*
*.mv.db
*.trace.db
# exclude testfiles and resources
#leftover from the old repository:
!africaKeytables.mv.db
#needed for the tutorial
!tutorial/src/main/resources/test.oshdb.keytables.mv.db
!tutorial/src/main/resources/test.oshdb.mv.db
### custom rules for oshdb-examples ###
......@@ -6,8 +6,8 @@ You can checkout this repository an run the classes to see imediate results and
# Tutorial
The [Tutorial](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/oshdb-examples/tree/master/src/main/java/org/heigit/bigspatialdata/oshdb/tutorial) is a quick and simple dive into the OSHDB-API-Code.
The [Tutorial](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/oshdb-examples/tree/master/src/main/java/org/heigit/ohsome/oshdb/tutorial) is a quick and simple dive into the OSHDB-API-Code.
# Analyses
Some example analyses used in research are demonstrated in th [analyses](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/oshdb-examples/tree/master/src/main/java/org/heigit/bigspatialdata/oshdb/examples/analyses) package.
Some example analyses used in research are demonstrated in th [analyses](https://gitlab.gistools.geog.uni-heidelberg.de/giscience/big-data/ohsome/oshdb-examples/tree/master/src/main/java/org/heigit/ohsome/oshdb/examples/analyses) package.
......@@ -9,9 +9,9 @@
<packaging>jar</packaging>
<parent>
<groupId>org.heigit.bigspatialdata</groupId>
<artifactId>bigspatialdata-parent</artifactId>
<version>1.1</version>
<groupId>org.heigit.ohsome</groupId>
<artifactId>ohsome-parent</artifactId>
<version>2.3</version>
</parent>
<properties>
......@@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.heigit.bigspatialdata</groupId>
<groupId>org.heigit.ohsome</groupId>
<artifactId>oshdb-api</artifactId>
<version>${oshdb.version}</version>
</dependency>
......@@ -48,4 +48,4 @@
</dependencies>
</project>
\ No newline at end of file
</project>
package org.heigit.bigspatialdata.oshdb.examples.analyses;
package org.heigit.ohsome.oshdb.examples.analyses;
import java.util.Map;
import java.util.SortedMap;
......
package org.heigit.bigspatialdata.oshdb.examples.analyses;
package org.heigit.ohsome.oshdb.examples.analyses;
import java.util.Arrays;
import java.util.List;
......
package org.heigit.bigspatialdata.oshdb.tutorial;
package org.heigit.ohsome.oshdb.tutorial;
import java.sql.SQLException;
import java.util.Arrays;
......
package org.heigit.bigspatialdata.oshdb.tutorial;
package org.heigit.ohsome.oshdb.tutorial;
import java.io.IOException;
import java.sql.SQLException;
......
package org.heigit.bigspatialdata.oshdb.tutorial;
package org.heigit.ohsome.oshdb.tutorial;
import java.util.Arrays;
import java.util.Iterator;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment