Skip to content

Commit b20e8e7

Browse files
Andy2003Andy2003
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into merge-osm
2 parents 885f662 + b8941e3 commit b20e8e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+368
-209
lines changed

‎neo.sld.xml‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
22
<!--
3-
4-
Copyright (c) "Neo4j"
5-
Neo4j Sweden AB [http://neo4j.com]
6-
7-
This file is part of Neo4j Spatial.
8-
9-
Neo4j is free software: you can redistribute it and/or modify
10-
it under the terms of the GNU General Public License as published by
11-
the Free Software Foundation, either version 3 of the License, or
12-
(at your option) any later version.
13-
14-
This program is distributed in the hope that it will be useful,
15-
but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
GNU General Public License for more details.
18-
19-
You should have received a copy of the GNU General Public License
20-
along with this program. If not, see <http://www.gnu.org/licenses/>.
21-
22-
-->
3+
~ Copyright (c) "Neo4j"
4+
~ Neo4j Sweden AB [http://neo4j.com]
5+
~
6+
~ This file is part of Neo4j Spatial.
7+
~
8+
~ Neo4j is free software: you can redistribute it and/or modify
9+
~ it under the terms of the GNU General Public License as published by
10+
~ the Free Software Foundation, either version 3 of the License, or
11+
~ (at your option) any later version.
12+
~
13+
~ This program is distributed in the hope that it will be useful,
14+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
~ GNU General Public License for more details.
17+
~
18+
~ You should have received a copy of the GNU General Public License
19+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
20+
-->
2321
<StyledLayerDescriptor version="1.0.0"
2422
xmlns="http://www.opengis.net/sld" xmlns:ogc="http://www.opengis.net/ogc"
2523
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

‎src/main/assembly/docs-assembly.xml‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
<!--
2-
3-
Copyright (c) "Neo4j"
4-
Neo4j Sweden AB [http://neo4j.com]
5-
6-
This file is part of Neo4j Spatial.
7-
8-
Neo4j is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
This program is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU General Public License for more details.
17-
18-
You should have received a copy of the GNU General Public License
19-
along with this program. If not, see <http://www.gnu.org/licenses/>.
20-
21-
-->
2+
~ Copyright (c) "Neo4j"
3+
~ Neo4j Sweden AB [http://neo4j.com]
4+
~
5+
~ This file is part of Neo4j Spatial.
6+
~
7+
~ Neo4j is free software: you can redistribute it and/or modify
8+
~ it under the terms of the GNU General Public License as published by
9+
~ the Free Software Foundation, either version 3 of the License, or
10+
~ (at your option) any later version.
11+
~
12+
~ This program is distributed in the hope that it will be useful,
13+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
~ GNU General Public License for more details.
16+
~
17+
~ You should have received a copy of the GNU General Public License
18+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
-->
2220
<assembly>
2321
<id>docs</id>
2422
<includeBaseDirectory>false</includeBaseDirectory>

‎src/main/assembly/geoserver-plugin.xml‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
<!--
2-
3-
Copyright (c) "Neo4j"
4-
Neo4j Sweden AB [http://neo4j.com]
5-
6-
This file is part of Neo4j Spatial.
7-
8-
Neo4j is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
This program is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU General Public License for more details.
17-
18-
You should have received a copy of the GNU General Public License
19-
along with this program. If not, see <http://www.gnu.org/licenses/>.
20-
21-
-->
2+
~ Copyright (c) "Neo4j"
3+
~ Neo4j Sweden AB [http://neo4j.com]
4+
~
5+
~ This file is part of Neo4j Spatial.
6+
~
7+
~ Neo4j is free software: you can redistribute it and/or modify
8+
~ it under the terms of the GNU General Public License as published by
9+
~ the Free Software Foundation, either version 3 of the License, or
10+
~ (at your option) any later version.
11+
~
12+
~ This program is distributed in the hope that it will be useful,
13+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
~ GNU General Public License for more details.
16+
~
17+
~ You should have received a copy of the GNU General Public License
18+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
-->
2220
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2321
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2422
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

‎src/main/assembly/server-plugin.xml‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
<!--
2-
3-
Copyright (c) "Neo4j"
4-
Neo4j Sweden AB [http://neo4j.com]
5-
6-
This file is part of Neo4j Spatial.
7-
8-
Neo4j is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
This program is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU General Public License for more details.
17-
18-
You should have received a copy of the GNU General Public License
19-
along with this program. If not, see <http://www.gnu.org/licenses/>.
20-
21-
-->
2+
~ Copyright (c) "Neo4j"
3+
~ Neo4j Sweden AB [http://neo4j.com]
4+
~
5+
~ This file is part of Neo4j Spatial.
6+
~
7+
~ Neo4j is free software: you can redistribute it and/or modify
8+
~ it under the terms of the GNU General Public License as published by
9+
~ the Free Software Foundation, either version 3 of the License, or
10+
~ (at your option) any later version.
11+
~
12+
~ This program is distributed in the hope that it will be useful,
13+
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
~ GNU General Public License for more details.
16+
~
17+
~ You should have received a copy of the GNU General Public License
18+
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
19+
-->
2220
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
2321
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2422
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">

‎src/main/java/org/neo4j/gis/spatial/DefaultLayer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* GNU General Public License for more details.
1616
*
1717
* You should have received a copy of the GNU General Public License
18-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
18+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
2020
package org.neo4j.gis.spatial;
2121

‎src/main/java/org/neo4j/gis/spatial/EditableLayerImpl.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
*
55
* This file is part of Neo4j Spatial.
66
*
7-
* Neo4j is free software: you can redistribute it and/or modify it under the
8-
* terms of the GNU General Public License as published by the Free
9-
* Software Foundation, either version 3 of the License, or (at your option) any
10-
* later version.
7+
* Neo4j is free software: you can redistribute it and/or modify
8+
* it under the terms of the GNU General Public License as published by
9+
* the Free Software Foundation, either version 3 of the License, or
10+
* (at your option) any later version.
1111
*
12-
* This program is distributed in the hope that it will be useful, but WITHOUT
13-
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
14-
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
15-
* details.
12+
* This program is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
* GNU General Public License for more details.
1616
*
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.

‎src/main/java/org/neo4j/gis/spatial/SpatialRelationshipTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@
2727
*/
2828
public enum SpatialRelationshipTypes implements RelationshipType {
2929
LAYER, NETWORK, SPATIAL, LAYERS, DATASETS, LAYER_CONFIG, DATASET, PROPERTY_MAPPING
30-
}
30+
}

‎src/main/java/org/neo4j/gis/spatial/encoders/AbstractSinglePropertyEncoder.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20+
2021
package org.neo4j.gis.spatial.encoders;
2122

2223
import org.neo4j.gis.spatial.AbstractGeometryEncoder;

‎src/main/java/org/neo4j/gis/spatial/encoders/neo4j/Neo4jPoint.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20+
2021
package org.neo4j.gis.spatial.encoders.neo4j;
2122

2223
import java.util.ArrayList;

‎src/main/java/org/neo4j/gis/spatial/index/IndexManager.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* You should have received a copy of the GNU General Public License
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
20+
2021
package org.neo4j.gis.spatial.index;
2122

2223
import java.util.List;

0 commit comments

Comments
 (0)