Sarah Hoffmann
cf4a44aaf7
introduce chksql function for phpscripts
...
Checks SQL query results for errors and bails out if it finds one.
Avoids some heavy code duplication all over the place.
2016-06-09 20:37:51 +02:00
Sarah Hoffmann
85c72cdccd
remove --create-website function
...
Symlinking does not go well with the separate build directory.
The recommended method is now to serve the website directly from
build/website via an alias. 'website installation' may be
reintroduced later via cmake.
2016-06-08 23:41:36 +02:00
Sarah Hoffmann
3a41b0dfbf
Merge pull request #464 from lonvia/vagrant-with-docs
...
Move installation documentation from wiki into /docs directory
2016-06-08 23:25:50 +02:00
Sarah Hoffmann
6436bab1be
remove old vagrant scripts
2016-06-08 23:23:09 +02:00
Sarah Hoffmann
91e1e4d614
fix formatting of docs
2016-06-08 23:17:48 +02:00
Sarah Hoffmann
af93973237
add compiled vagrant docs in docs/ directory
2016-06-08 23:06:15 +02:00
Sarah Hoffmann
2e08a61565
add vagrant script for ubuntu 16 and polish everything
2016-06-08 23:03:11 +02:00
Sarah Hoffmann
0adb8cb765
fix cut&paste error in php tests
2016-06-08 22:51:56 +02:00
Sarah Hoffmann
f71e9dd187
move installation instructions from wiki page here
2016-06-07 22:47:57 +02:00
Sarah Hoffmann
186a633185
fix apache permission problems in CentOS vagrant script
2016-06-07 00:27:20 +02:00
Sarah Hoffmann
d1b1acaf1d
split instruction into software installation and import
...
Basically leaves the part that needs to be done by the automatic
vagrant script in the bash script and moves the remaining part
into an OS-independent md file.
Also fixes some of the instructions for CentOS. Now almost runs
through (some minor issue with permission remains).
2016-06-07 00:17:15 +02:00
Sarah Hoffmann
ff6c3a705b
initial version of documented CentOS7 vagrant script
2016-06-05 16:15:26 +02:00
Sarah Hoffmann
badd2e46aa
provide srcdir for postgres module in VPATH and CPPFLAGS
...
The pgxs makefile in Postgres <= 9.2 cannot yet handle VPATH
correctly. Provide header paths explicitly and overwrite
VPATH after sourcing the pgxs file.
Fixes #454 .
2016-06-05 00:35:07 +02:00
markigail
98e5ba6b61
use place_id instead of parent_place_id for excluded place_ids in interpolation lines query
2016-06-04 23:54:17 +02:00
Sarah Hoffmann
2156fb1ad7
remove reference assignment where unnecessary
...
Avoids a number of warnings on PHP7.
2016-06-04 23:46:19 +02:00
Sarah Hoffmann
92095c9247
Merge branch 'interpolations'
2016-06-04 23:29:11 +02:00
Sarah Hoffmann
524bd47315
fill place and osmline independently for interpolations on update
...
interpolation lines may be missing in osmline when the interpolation
is broken, so we cannot conclude that a way is not in place, just
because there are no entries in location_property_osmline.
2016-05-28 18:18:18 +02:00
Sarah Hoffmann
c3e21ea388
reinstate tests for geometrytype
2016-05-27 23:36:01 +02:00
Sarah Hoffmann
f0d962f8a0
fix variable name in search xml output
2016-05-27 23:35:24 +02:00
Sarah Hoffmann
e4963256e1
cmake: use explicit VPATH when calling pgxs makefile
...
Some postgres installations report problems with the makefile
magic that should look for the source where the Makefile is
located. So hand in the path explicitly via VPATH instead.
Fixes #453 .
2016-05-24 00:24:23 +02:00
Sarah Hoffmann
362f259f47
cmake: force-set options and explicitly check for pgxs makefile
...
fixes #443
2016-05-23 22:20:59 +02:00
Sarah Hoffmann
8b91284f7f
reintroduce addr:place for interpolation
...
It is perfectly valid that interpolated addresses refer to
something else than a street.
Also gets rid of the maximum interpolation size. As we don't
expand, arbitrary sizes are fine.
2016-05-15 14:24:43 +02:00
Sarah Hoffmann
2a0c7fb57a
tests: permit duplicate entries in interpolation table
...
fixes self-intersecting interpolation test
2016-05-15 14:24:12 +02:00
Sarah Hoffmann
2fecc0c465
tests for interpolation to building type change
2016-05-15 12:37:49 +02:00
Sarah Hoffmann
94d795883f
update comments and formatting
2016-05-15 12:37:20 +02:00
Sarah Hoffmann
f0f6fcf256
fix scene making scripts and add building-parallel-road scene
...
Scripts updated to newest libosmium and shebang fixed.
2016-05-15 12:36:16 +02:00
Sarah Hoffmann
28041cbbd9
remove duplicate index
2016-05-15 11:44:54 +02:00
Sarah Hoffmann
821949f087
get housenumber data for interpolations from place table
...
The placex table may not yet be filled when the interpolation
lines are computed.
2016-05-15 09:44:00 +02:00
Sarah Hoffmann
0fcab79486
fix syntax in load-data function
...
Also makes sure that load data runs with at least 2 threads: one
for loading placex and one for loading osmline.
2016-05-15 09:41:11 +02:00
Sarah Hoffmann
234b1b0293
Merge remote-tracking branch 'markus/master' into master
2016-05-14 21:09:57 +02:00
markigail
f07d620ee8
Change load-data in setup.php.
2016-05-11 10:22:03 +02:00
markigail
190a72cab5
Fix bug in index.c and remove column admin_level from location_property_osmline.
2016-05-08 16:46:42 +02:00
markigail
1a4f369e2b
fix small bug in index.c
2016-05-03 12:52:08 +02:00
mtmail
ce112f7c20
Merge pull request #447 from lonvia/fix-array-expression
...
replace new-style [] expression with old-style array()
2016-05-01 11:53:54 +02:00
Sarah Hoffmann
4e0e0c1797
replace new-style [] expression with old-style array()
...
Also removes some unused code.
fixes #444
2016-05-01 11:22:53 +02:00
Sarah Hoffmann
54ef9105d0
Merge pull request #446 from mtmail/make-outline-clickable-in-ui
...
UI: the result outline (geojson/polygon) now lets the map handle clicks
2016-05-01 11:11:21 +02:00
marc tobias
9e1421fb6c
UI: the result outline (geojson/polygon) now lets the map handle its clicks
2016-05-01 10:47:13 +02:00
Markus Gail
2ba9c11dd0
fix bug in Geocode.php
2016-04-29 10:24:30 +02:00
Markus Gail
db719d489f
index on geometry of interpolation lines, and more improvements.
2016-04-27 17:42:59 +02:00
Sarah Hoffmann
7a5aab61ae
Merge pull request #441 from mtmail/update-php-to-check-for-correct-js-file
...
update.php was checking for static file which is no longer part of the project
2016-04-26 21:03:58 +02:00
Marc Tobias Metten
7b4806b2e8
update.php was checking for static file which is no longer part of the project
2016-04-26 20:45:48 +02:00
Markus Gail
a10f537131
Correct merge error in Geocode.php.
2016-04-25 17:44:34 +02:00
Markus Gail
89c556d163
Coding style adaptions and correcting small errors from merge.
2016-04-25 13:58:28 +02:00
Markus Gail
b03be15442
Merge remote-tracking branch 'origin/master' into osmline
...
Conflicts:
lib/Geocode.php
lib/PlaceLookup.php
sql/functions.sql
sql/tables.sql
utils/setup.php
2016-04-25 11:01:04 +02:00
Markus Gail
7879ad44cd
Remove interpolation lines from placex and save them in an extra table.
2016-04-25 09:44:01 +02:00
Sarah Hoffmann
131527bdab
Merge pull request #436 from lonvia/remove-location-property-tables
...
remove unused location_property_-partion- tables
2016-04-24 16:05:10 +02:00
Sarah Hoffmann
a244c41ea7
create_sql_functions() needs the commandline parameters
...
Fixes one failing test.
2016-04-23 11:07:12 +02:00
Sarah Hoffmann
a32f6c66b8
remove unused location_property_-partion- tables
2016-04-23 10:07:57 +02:00
Sarah Hoffmann
b4f0b8b728
apply marker filtering to functions.sql also after table creation
...
fixes #430
2016-04-21 00:00:15 +02:00
Sarah Hoffmann
af06d31d21
remove duplicate CORS header
...
fixes #427
2016-04-12 23:04:38 +02:00