Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/origin/integrate_postgis'
Browse files Browse the repository at this point in the history
  • Loading branch information
lorenzogiust committed Mar 2, 2017
2 parents 9690618 + 809b2e7 commit 15a3fc8
Show file tree
Hide file tree
Showing 20 changed files with 1,009 additions and 506 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ Replace Schema "alias" in the configuration file config/app.php and, if needed,

```
// GeoLaravel integration
'Schema' => LorenzoGiust\GeoLaravel\Schema\Schema::class,
'GeoModel' => LorenzoGiust\GeoLaravel\Model::class
'Schema' => ElevenLab\GeoLaravel\Schema\Schema::class,
'GeoModel' => ElevenLab\GeoLaravel\Model::class
```

# GEOSPATIAL
Expand Down Expand Up @@ -113,7 +113,7 @@ $p = new Polygon([$l1, $l1])
* */
1) aggiunto in config/app.php l'alias:

'GeoModel' => LorenzoGiust\GeoLaravel\Model::class
'GeoModel' => ElevenLab\GeoLaravel\Model::class

TODO:
* MultiGeometry - aggiungere classe per gestire oggetti geometrici multipli
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "elevenlab/laravel-geo",
"description": "Geospatial integration for Laravel 5.1",
"description": "Spatial OGC objects integration for Laravel 5.*",
"license": "MIT",
"keywords": ["geospatial", "laravel", "spatial", "geo"],
"authors": [
Expand All @@ -13,20 +13,20 @@
"require": {
"php": ">=5.4.0",
"illuminate/database": "~5.0",
"elevenlab/php-geospatial": "dev-master"
"elevenlab/php-ogc": "dev-master"
},
"require-dev": {
"phpunit/phpunit": "4.0.*"
},
"autoload": {
"psr-4": {
"LorenzoGiust\\GeoLaravel\\": "src/"
"ElevenLab\\GeoLaravel\\": "src/"
}
},
"repositories": [
{
"type": "vcs",
"url": "git@bitbucket.org:elevenlab/php-geospatial.git"
"url": "git@bitbucket.org:elevenlab/php-ogc.git"
}
]
}
}
Loading

0 comments on commit 15a3fc8

Please sign in to comment.