Skip to content

GEPS 045 - a second attempt at enhanced places #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
prculley wants to merge 25 commits into from
Closed

GEPS 045 - a second attempt at enhanced places #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cb0f80b
linting
prculley Mar 22, 2025
8583770
GEPS045 Place Enhancements
prculley Jul 18, 2020
2797de0
GEPS045 Place Formats
prculley Jul 18, 2020
13c082c
Refactor Gedcom import to remove alt-location and order dependencies
prculley Aug 31, 2017
f35eebe
GEPS045/043 Gedcom import support for Gedcom L place handling
prculley Sep 29, 2017
66c3a74
GEPS045 Gedcom L Export support
prculley Sep 28, 2017
3b3c530
Make Gedcom L enhanced places an option for GEDCOM export
prculley Nov 10, 2019
d842e06
GEPS045 tests
prculley Jul 18, 2020
07a46b2
GEPS045 filters and rules
prculley Jul 18, 2020
15e851a
Import/Export for GEPS045
prculley Jul 18, 2020
783b88f
Avoid duplicted attributes on add
prculley Jun 4, 2019
ef927b9
Add Place Attribute Gramplet
prculley Jun 6, 2019
27465d6
Reports for GEPS045
prculley Jul 18, 2020
7f0d563
Fix Testcasegenerator for enhanced places
prculley Jun 18, 2019
75eddcd
Fix tags.py for crash when XML unsafe tag names are used
prculley Jun 18, 2019
2700002
fix place coordinates to always use English NSEW
prculley Oct 27, 2019
8fa306b
Fix empty PLAC/NAME when using private proxy
prculley Nov 25, 2019
ca443c9
Fix Complete Individual report for crash when number of sections changes
prculley Nov 26, 2019
07024db
Fix crash on change in number of columns in view
prculley Jun 22, 2020
71b4e56
GEPS045 Replace Place Types and Assign place groups menu commands
prculley Jun 12, 2020
b4db934
GEPS045 PlaceType plugins/addons
prculley Jun 12, 2020
1bdc2ad
Fix Check&Repair to find bad handle references where handle is empty …
prculley Jun 15, 2020
df9fd01
Test Error handling
prculley Jun 16, 2020
8065fd9
Fix Locations Gramplet to properly respond to signals
prculley Jul 3, 2020
cbfe9d7
GEPS045 Fix Testcasegenerator for enhanced places
prculley Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions data/grampsxml.dtd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
-->

<!--
This is the Document Type Definition file for v1.7.2
This is the Document Type Definition file for v1.8.0
of the GRAMPS XML genealogy data format.
Please use the following formal public identifier to identify it:

"-//GRAMPS//DTD GRAMPS XML V1.7.2//EN"
"-//GRAMPS//DTD GRAMPS XML V1.8.0//EN"

For example:
<!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.7.2//EN"
"http://gramps-project.org/xml/1.7.2/grampsxml.dtd"
<!DOCTYPE database PUBLIC "-//GRAMPS//DTD GRAMPS XML V1.8.0//EN"
"http://gramps-project.org/xml/1.8.0/grampsxml.dtd"
[...]>
-->

Expand All @@ -58,10 +58,10 @@ DATABASE
tags
-->

<!ELEMENT database (header, name-formats?, tags?, events?, people?, families?,
citations?, sources?, places?, objects?, repositories?,
notes?, bookmarks?, namemaps?)>
<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.7.2/">
<!ELEMENT database (header, name-formats?, tags?, events?,
people?, families?, citations?, sources?, places?,
objects?, repositories?, notes?, bookmarks?, namemaps?)>
<!ATTLIST database xmlns CDATA #FIXED "http://gramps-project.org/xml/1.8.0/">


<!-- ************************************************************
Expand Down Expand Up @@ -251,25 +251,37 @@ PLACES

<!ELEMENT places (placeobj)*>

<!ELEMENT placeobj (ptitle?, code?, pname+, coord?, placeref*, location*,
objref*, url*, noteref*, citationref*, tagref*)>
<!ELEMENT placeobj (ptitle?, pname+, ptype+, coord?, placeref*, location*,
objref*, url*, noteref*, citationref*, tagref*,
attribute*, eventref*)>
<!ATTLIST placeobj
id CDATA #IMPLIED
handle ID #REQUIRED
priv (0|1) #IMPLIED
change CDATA #REQUIRED
type CDATA #REQUIRED
group CDATA #REQUIRED
>

<!ELEMENT pname (daterange|datespan|dateval|datestr)?>

<!ELEMENT pname ((daterange|datespan|dateval|datestr)?, citationref*,
pabbr*)>
<!ATTLIST pname
lang CDATA #IMPLIED
value CDATA #REQUIRED
>

<!ELEMENT ptitle (#PCDATA)>
<!ELEMENT code (#PCDATA)>

<!ELEMENT placeref ((daterange|datespan|dateval|datestr)?, citationref*)>
<!ATTLIST placeref
type CDATA #IMPLIED
hlink IDREF #REQUIRED
>

<!ELEMENT ptype ((daterange|datespan|dateval|datestr)?, citationref*)>
<!ATTLIST ptype
pt_id CDATA #REQUIRED
name CDATA #REQUIRED
>

<!ELEMENT coord EMPTY>
<!ATTLIST coord
Expand All @@ -289,6 +301,12 @@ PLACES
postal CDATA #IMPLIED
phone CDATA #IMPLIED
>
<!ELEMENT pabbr EMPTY>
<!ATTLIST pabbr
type CDATA #IMPLIED
value CDATA #REQUIRED
>


<!-- ************************************************************
OBJECTS
Expand Down Expand Up @@ -319,7 +337,7 @@ REPOSITORIES

<!ELEMENT repositories (repository)*>

<!ELEMENT repository (rname, type, address*, url*, noteref*, tagref*)>
<!ELEMENT repository (rname?, type, address*, url*, noteref*, tagref*)>
<!ATTLIST repository
id CDATA #IMPLIED
handle ID #REQUIRED
Expand Down Expand Up @@ -534,11 +552,6 @@ SHARED ELEMENTS
priv (0|1) #IMPLIED
>

<!ELEMENT placeref ((daterange|datespan|dateval|datestr)?)>
<!ATTLIST placeref
hlink IDREF #REQUIRED
>

<!ELEMENT region EMPTY>
<!ATTLIST region
corner1_x CDATA #REQUIRED
Expand Down
40 changes: 36 additions & 4 deletions data/grampsxml.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@


<grammar
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="http://gramps-project.org/xml/1.7.2/"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="http://gramps-project.org/xml/1.8.0/"
xmlns="http://relaxng.org/ns/structure/1.0">

<start><element name="database">
Expand Down Expand Up @@ -450,13 +450,15 @@
</define>

<define name="place-content">
<attribute name="group"><text/></attribute>
<ref name="primary-object"/>
<attribute name="type"><text/></attribute>
<optional><element name="ptitle"><text/></element></optional>
<optional><element name="code"><text/></element></optional>
<oneOrMore><element name="pname">
<ref name="placename-content"/>
</element></oneOrMore>
<oneOrMore><element name="ptype">
<ref name="placetype-content"/>
</element></oneOrMore>
<optional><element name="coord">
<attribute name="long"><text/></attribute>
<attribute name="lat"><text/></attribute>
Expand Down Expand Up @@ -490,6 +492,12 @@
<zeroOrMore><element name="tagref">
<ref name="tagref-content"/>
</element></zeroOrMore>
<zeroOrMore><element name="attribute">
<ref name="attribute-content"/>
</element></zeroOrMore>
<zeroOrMore><element name="eventref">
<ref name="eventref-content"/>
</element></zeroOrMore>
</define>

<define name="object-content">
Expand Down Expand Up @@ -752,11 +760,35 @@
<attribute name="value"><text/></attribute>
<optional><attribute name="lang"><text/></attribute></optional>
<optional><ref name="date-content"/></optional>
<zeroOrMore><element name="citationref">
<ref name="citationref-content"/>
</element></zeroOrMore>
<zeroOrMore><element name="pabbr">
<ref name="pabbr-content"/>
</element></zeroOrMore>
</define>

<define name="placetype-content">
<attribute name="pt_id"><text/></attribute>
<attribute name="name"><text/></attribute>
<optional><ref name="date-content"/></optional>
<zeroOrMore><element name="citationref">
<ref name="citationref-content"/>
</element></zeroOrMore>
</define>

<define name="placeref-content">
<attribute name="type"><text/></attribute>
<attribute name="hlink"><data type="IDREF"/></attribute>
<optional><ref name="date-content"/></optional>
<zeroOrMore><element name="citationref">
<ref name="citationref-content"/>
</element></zeroOrMore>
</define>

<define name="pabbr-content">
<attribute name="type"><text/></attribute>
<attribute name="value"><text/></attribute>
</define>

<define name="tagref-content">
Expand Down
Binary file added data/tests/1024px-Texas_flag_map.svg.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading