Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opengeospatial/geopackage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.2-a1
Choose a base ref
...
head repository: opengeospatial/geopackage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 350 changed files with 28,683 additions and 4,298 deletions.
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -2,4 +2,11 @@
/build/
Gemfile.lock
*.iml
.project
.project
.DS_Store
/spec/conceptual-model/relaton
document.doc
document.html
document.err
document.presentation.xml
document.xml
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
language: ruby
rvm:
- 2.0.0
branches:
only:
- master
script: rake travis
env:
global:
secure: "QInDBXzpGlpDjIBj70VY8jgnmum5pOPE+DVAMmHFGO1QRKUdnI09R5Jw3+EHCzEqjzCDV5d74HyUjaULyba/euXYJtTM4pEAMkh1Tjc/B67uk8inH+KTa2dCbSeBjWOrdE+DyexoQggCbe65KMa7JpK6U04rDrppgPxbQTnVl4Q="
secure: "AAAAB3NzaC1yc2EAAAADAQABAAACAQDE1PH04S9emq7EveGUBsquUDArpKLIB2V+HyvZ3Yu5/E7jl2sLMpe+VJJo5Pk1YBX2+ink+1DNvAeZ0juC6otHuY+RzCVskT2f6x/HwYfASMTi/bBJLSvH2wcp9QSiqca0vY17ihWryzbCJq6IWQ4z5EuRcCiUXAebRog9/Wx9DFQzDHCh0jzdzZp2UfAt1BbSx54oGFQQdCT4zooytfX/4SMf5fSDlXLJ+1vp5IMx1VwEUENP/7Q3oBt1IJcoxwavlAiCBIhengTPGmGYFH8hDJ5nuv9xV2aNyl2/2KXcZLos4EnH9iNC04rFH82GZjTlXMTReJ4ihUY+103hCM3An2sUZDq0AOxp61CISa8GqTMD1Ktka7aMAvYMRZ3qo/5dXaTsXBWgUm7++1Tpy/pzEkZ3RMtl6U5XEIPkL3ePSaTO0lqSW0bPuXg0zxOikHiEiaScG8PRnJggv75yWlmv1JDiyi1qLIsIPI+gNSkI+/DaYZdwsQgdohGtRiO7T/YpK7qM9vEOv0T8GqDLnqk3SrAQ4EFb4Kc0z/mw924boMMVBpo+BM9gESU2p3IPfLmTmp9fHpIaUl//igVrUmO2bqSlT+W3I943DgeehnAtzfM7cvtbIbIhQz/fiqo3iSkg5leJDdDwKkNZbapBQ6Qvgw6eNYuagFjoAyI0CO0oQw=="

2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rake', '>= 0.9.2'
gem 'asciidoctor', '~> 0.1.4'
gem 'asciidoctor', '~> 1.5.8'
gem 'coderay', '1.0.9'
gem 'tilt'
27 changes: 7 additions & 20 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
**Copyright notice:**
# License Agreement

Copyright © 2012 Envitia
Permission is hereby granted by the Open Geospatial Consortium, ("Licensor"), free of charge and subject to the terms set forth below, to any person obtaining a copy of this Intellectual Property and any associated documentation, to deal in the Intellectual Property without restriction (except as set forth below), including without limitation the rights to implement, use, copy, modify, merge, publish, distribute, and/or sublicense copies of the Intellectual Property, and to permit persons to whom the Intellectual Property is furnished to do so, provided that all copyright notices on the intellectual property are retained intact and that each person to whom the Intellectual Property is furnished agrees to the terms of this Agreement.

Copyright © 2012 Luciad
If you modify the Intellectual Property, all copies of the modified Intellectual Property must include, in addition to the above copyright notice, a notice that the Intellectual Property includes modifications that have not been approved or adopted by LICENSOR.

Copyright © 2012 Sigma Bravo.
THIS LICENSE IS A COPYRIGHT LICENSE ONLY, AND DOES NOT CONVEY ANY RIGHTS UNDER ANY PATENTS THAT MAY BE IN FORCE ANYWHERE IN THE WORLD.

Copyright © 2012 The Carbon Project.
THE INTELLECTUAL PROPERTY IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE DO NOT WARRANT THAT THE FUNCTIONS CONTAINED IN THE INTELLECTUAL PROPERTY WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE INTELLECTUAL PROPERTY WILL BE UNINTERRUPTED OR ERROR FREE. ANY USE OF THE INTELLECTUAL PROPERTY SHALL BE MADE ENTIRELY AT THE USER'S OWN RISK. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ANY CONTRIBUTOR OF INTELLECTUAL PROPERTY RIGHTS TO THE INTELLECTUAL PROPERTY BE LIABLE FOR ANY CLAIM, OR ANY DIRECT, SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM ANY ALLEGED INFRINGEMENT OR ANY LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR UNDER ANY OTHER LEGAL THEORY, ARISING OUT OF OR IN CONNECTION WITH THE IMPLEMENTATION, USE, COMMERCIALIZATION OR PERFORMANCE OF THIS INTELLECTUAL PROPERTY.

Copyright © 2012 U.S. Army Geospatial Center.
This license is effective until terminated. You may terminate it at any time by destroying the Intellectual Property together with all copies in any form. The license will also terminate if you fail to comply with any term or condition of this Agreement. Except as provided in the following sentence, no such termination of this license shall require the termination of any third party end-user sublicense to the Intellectual Property which is in force as of the date of notice of such termination. In addition, should the Intellectual Property, or the operation of the Intellectual Property, infringe, or in LICENSOR's sole opinion be likely to infringe, any patent, copyright, trademark or other right of a third party, you agree that LICENSOR, in its sole discretion, may terminate this license without any compensation or liability to you, your licensees or any other party. You agree upon termination of any kind to destroy or cause to be destroyed the Intellectual Property together with all copies in any form, whether held by you or by any third party.

Copyright © 2012 U.S. National Geospatial Intelligence Agency.

The companies listed above have granted the Open Geospatial Consortium (OGC) a nonexclusive,
royalty-free, paid up, worldwide license to copy and distribute this document and to modify this
document and distribute copies of the modified version. To obtain additional rights of use,
visit http://www.opengeospatial.org/legal/.

**Warning:**

This document is not an OGC Standard. It is distributed for review and comment. It is subject to
change without notice and MAY not be referred to as an OGC Standard.

Recipients of this document are invited to submit, with their comments, notification of any relevant
patent rights of which they are aware and to provide supporting documentation.
Except as contained in this notice, the name of LICENSOR or of any other holder of a copyright in all or part of the Intellectual Property shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Intellectual Property without prior written authorization of LICENSOR or such copyright holder. LICENSOR is and shall at all times be the sole entity that may authorize you or any third party to use certification marks, trademarks or other special designations to indicate compliance with any LICENSOR standards or specifications. This Agreement is governed by the laws of the Commonwealth of Massachusetts. The application to this Agreement of the United Nations Convention on Contracts for the International Sale of Goods is hereby expressly excluded. In the event any provision of this Agreement shall be deemed unenforceable, void or invalid, such provision shall be modified so as to make it valid and enforceable, and as so modified the entire Agreement shall remain in full force and effect. No decision, action or inaction by LICENSOR shall be construed to be a waiver of any rights or remedies available to it.
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
![OGC Logo](http://portal.opengeospatial.org/files/?artifact_id=11976&format=gif "OGC Logo")
![OGC Logo](https://static.ogc.org/assets/ogc/2021/ogc_logo_2021-flat_hr_blue_wh-157x80.png "OGC Logo")

GeoPackage Standard
==========
==========

GeoPackage is an open, standards-based, platform-independent, portable, self-describing,
compact format for transferring geospatial information. The GeoPackage standard
describes a set of conventions for storing the following within an SQLite database:
* [vector features](spec/2_features.md)
* [tile matrix sets of imagery and raster maps at various scales](spec/3_tiles.md)
* [schema](spec/4_schema.md)
* [metadata](spec/5_metadata.md)
* [extensions](spec/8_extensions.md)

These capabilities are built on a common [base](spec/1_base.md) and an
[Extension Mechanism](spec/7_extensions-mechanism.md) is
* [vector features](spec/core/2a_features.adoc)
* [tile matrix sets of imagery and raster maps at various scales](spec/core/2b_tiles.adoc)
* [attributes (non-spatial data)](spec/core/2f_attributes.adoc)
* [extensions](spec/core/annexes/extensions.adoc)

These capabilities are built on a common [base](spec/core/1_base.adoc) and an
[Extension Mechanism](spec/core/2e_extensions-mechanism.adoc) is
described to provide implementors a way to include additional functionality in their GeoPackages.

This OGC® Encoding Standard defines the schema for a GeoPackage,
@@ -23,7 +23,7 @@ The allowable content of a GeoPackage is entirely defined in this standard.
For more information about GeoPackage, including implementations and sample data,
go to the public page at http://www.geopackage.org.
An HTML version of the standard is available at http://www.geopackage.org/spec/.
The asciidoc source for the standard is in the [spec/](spec/) folder.
The asciidoc source for the standard is in the [spec/core/](spec/core/) folder.

About
-----
@@ -53,18 +53,18 @@ The GeoPackage Standards Working Group (SWG) is the group at OGC responsible for
of the standard, but is working to do as much GeoPackage work in public as possible.

The Geopackage SWG currently has the following email lists:
- geopackage@lists.opengeospatial.org -- [sign up here](https://lists.opengeospatial.org/mailman/listinfo/geopackage)
- Public List
- geopackage@lists.opengeospatial.org -- [sign up here](https://lists.ogc.org/mailman/listinfo/geopackage)
- Public List, very little traffic.
- Open archives
- No Intellectual Property items should be discussed here.
- geopackage.swg@lists.opengeospatial.org -- [sign up here](https://lists.opengeospatial.org/mailman/listinfo/geopackage.swg)
- geopackage.swg@lists.opengeospatial.org -- [sign up here](https://lists.ogc.org/mailman/listinfo/geopackage.swg)
- Private List
- Access controlled archives
- Requires OGC membership and Observer Agreement to protect IPR (intellectual property rights)

**SWG Chair: Jeff Yutzler**

**SWG Vice Chair: Roy Rathbun**
**SWG Vice Chair: Tracey Birch**


Editing and commenting
@@ -78,7 +78,7 @@ include a comment in the PR with any justification or reasoning on why the chang
For more general comments (that don't include actual text changes to the spec) please create a GitHub
[issue](https://github.com/opengeospatial/geopackage/issues) for that topic.

Complex changes and feature requests must go throught the [change request](http://portal.opengeospatial.org/public_ogc/change_request.php) process. The details entered
Complex changes and feature requests must go through the [change request](http://portal.opengeospatial.org/public_ogc/change_request.php) process. The details entered
in the change request form will help the SWG adjudicate and prioritize the request.

For more detailed guidance, or if you are new to GitHub, see the [Process page](process.md) for additional
13 changes: 12 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -5,9 +5,17 @@ task :init_local do
end

task :generate do
system './runasciidoctor -D build/spec -a stylesheet=./asciidoctor.css ./spec/index.adoc'
system 'bundle exec asciidoctor -D build/spec -I ./extensions -r asciidoctor_extensions.rb -a linkcss ./spec/core/index.adoc'
system 'bundle exec asciidoctor -D build/spec/2d-gridded-coverage -I ./extensions -r asciidoctor_extensions.rb -a linkcss -o index.html ./spec/2d-gridded-coverage/standard_document.adoc'
system 'bundle exec asciidoctor -D build/spec/related-tables -I ./extensions -r asciidoctor_extensions.rb -a linkcss -o index.html ./spec/related-tables/standard_document.adoc'
system 'bundle exec asciidoctor -D build/guide ./ghpages/implementation_guide.adoc'
system 'bundle exec asciidoctor -D build ./ghpages/extensions.adoc'
FileUtils.cp_r 'images/.', 'build/spec'
FileUtils.cp_r 'stylesheets/.', 'build/spec'
FileUtils.cp_r 'spec/2d-gridded-coverage/images/.', 'build/spec/2d-gridded-coverage/images'
FileUtils.cp_r 'stylesheets/.', 'build/spec/2d-gridded-coverage'
FileUtils.cp_r 'spec/related-tables/images/.', 'build/spec/related-tables/images'
FileUtils.cp_r 'stylesheets/.', 'build/spec/related-tables'
end

desc 'Generate site'
@@ -21,6 +29,9 @@ task :init_travis do
Dir.chdir 'build/spec'
system 'git rm -r .'
Dir.chdir '../..'
Dir.chdir 'build/guide'
system 'git rm -r .'
Dir.chdir '../..'
end

task :publish do
8 changes: 4 additions & 4 deletions extensions/asciidoctor_extensions.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'asciidoctor'
require File.dirname(__FILE__) + '/asciidoctor_patch'
require 'asciidoctor/extensions'
require File.dirname(__FILE__) + '/requirement_block'

Asciidoctor::Extensions.register do |document|
block :requirement, RequirementBlock
end
Asciidoctor::Extensions.register do
block RequirementBlock
end
42 changes: 0 additions & 42 deletions extensions/asciidoctor_patch.rb

This file was deleted.

3 changes: 2 additions & 1 deletion extensions/requirement_block.rb
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
require 'asciidoctor/extensions'

class RequirementBlock < Asciidoctor::Extensions::BlockProcessor
option :name, :requirement
option :contexts, [:paragraph]
option :content_model, :simple

@@ -13,4 +14,4 @@ def process parent, reader, attributes

block = Asciidoctor::Block.new parent, :quote, :source => reader.lines, :attributes => attributes
end
end
end
Loading