Skip to content

Move models interlis CH to https #131

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
ponceta wants to merge 1 commit into from
Closed

Move models interlis CH to https #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions modelbaker/iliwrapper/ili2dbconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def to_ili2db_args(self, with_modeldir=True, with_usabilityhub_repo=False):
# Can be removed when ili2db has access to the UsabILIty Hub repository.
args += [
"--modeldir",
"%ILI_FROM_DB;%XTF_DIR;http://models.interlis.ch/;%JAR_DIR;https://models.opengis.ch/",
"%ILI_FROM_DB;%XTF_DIR;https://models.interlis.ch/;%JAR_DIR;https://models.opengis.ch/",
]
if self.debugging_enabled and self.logfile_path:
args += ["--trace"]
Expand All @@ -96,7 +96,7 @@ def model_directories(self):
dirs = [
"%ILI_FROM_DB",
"%XTF_DIR",
"http://models.interlis.ch/",
"https://models.interlis.ch/",
"%JAR_DIR",
]
return dirs
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/ilimodels/Hazard_Mapping_V1_2.ili
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ INTERLIS 2.3;
The different classes are correspondingly commented.

This model calls the following different submodels:
-- from http://models.interlis.ch/
-- from https://models.interlis.ch/
-- CONTRACTED TYPE MODEL Units (en)
-- REFSYSTEM MODEL CoordSys (en) (implicitly; called by CHBase model)
-- from https;//models.geo.admin.ch/CH/
Expand Down
4 changes: 2 additions & 2 deletions tests/testdata/ilirepo/23/ilimodels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<HEADERSECTION SENDER="KOGIS-20200115" VERSION="2.3">
<MODELS>
<MODEL NAME="IliRepository09" VERSION="2009-12-01" URI="mailto:ce@eisenhutinformatik.ch"/>
<MODEL NAME="IliRepository20" VERSION="2020-01-15" URI="http://models.interlis.ch/core"/>
<MODEL NAME="IliRepository20" VERSION="2020-01-15" URI="https://models.interlis.ch/core"/>
</MODELS>
</HEADERSECTION>
<DATASECTION>
Expand Down Expand Up @@ -978,7 +978,7 @@
<File>core/IliRepository20.ili</File>
<Version>2020-01-15</Version>
<publishingDate>2020-04-01</publishingDate>
<Issuer>http://models.interlis.ch/core</Issuer>
<Issuer>https://models.interlis.ch/core</Issuer>
<technicalContact>mailto:info@interlis.ch</technicalContact>
<furtherInformation>https://www.interlis.ch</furtherInformation>
<md5>46cba395b5412de0232619a99cecb65c</md5>
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/ilirepo/24/ilimodels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<HEADERSECTION SENDER="KOGIS-20200115" VERSION="2.3">
<MODELS>
<MODEL NAME="IliRepository09" VERSION="2009-12-01" URI="mailto:ce@eisenhutinformatik.ch"/>
<MODEL NAME="IliRepository20" VERSION="2020-01-15" URI="http://models.interlis.ch/core"/>
<MODEL NAME="IliRepository20" VERSION="2020-01-15" URI="https://models.interlis.ch/core"/>
</MODELS>
</HEADERSECTION>
<DATASECTION>
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/ilirepo/invalid/ilimodels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<HEADERSECTION SENDER="KOGIS-20200115" VERSION="2.3">
<MODELS>
<MODEL NAME="IliRepository09" VERSION="2009-12-01" URI="mailto:ce@eisenhutinformatik.ch"/>
<MODEL NAME="IliRepository20" VERSION="2020-01-15" URI="http://models.interlis.ch/core"/>
<MODEL NAME="IliRepository20" VERSION="2020-01-15" URI="https://models.interlis.ch/core"/>
</MODELS>
</HEADERSECTION>
<DATASECTION>
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/ilirepo/usabilityhub/ilimodels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<HEADERSECTION SENDER="KOGIS-20200115" VERSION="2.3">
<MODELS>
<MODEL NAME="IliRepository09" VERSION="2009-12-01" URI="mailto:ce@eisenhutinformatik.ch"/>
<MODEL NAME="IliRepository20" VERSION="2020-01-15" URI="http://models.interlis.ch/core"/>
<MODEL NAME="IliRepository20" VERSION="2020-01-15" URI="https://models.interlis.ch/core"/>
</MODELS>
</HEADERSECTION>
<DATASECTION>
Expand Down
2 changes: 1 addition & 1 deletion tests/testdata/ilirepo/usabilityhub/ilisite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<technicalContact>mailto:info@interlis.ch</technicalContact>
<subsidiarySite>
<IliSite09.RepositoryLocation_>
<value>http://models.interlis.ch</value>
<value>https://models.interlis.ch</value>
</IliSite09.RepositoryLocation_>
</subsidiarySite>
</IliSite09.SiteMetadata.Site>
Expand Down
2 changes: 1 addition & 1 deletion ...irepo/usabilityhub/referencedata/opengisch_PlanerischerGewaesserschutz_Codetexte_V1_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ File PlanerischerGewaesserschutz_Codetexte_V1_1.xml, VERSION="2019-07-17" (https
<HEADERSECTION SENDER="BAFU" VERSION="2.3">
<MODELS>
<MODEL NAME="Units" VERSION="2012-02-20" URI="http://www.interlis.ch/models"/>
<MODEL NAME="CoordSys" VERSION="2015-11-24" URI="http://models.interlis.ch/models"/>
<MODEL NAME="CoordSys" VERSION="2015-11-24" URI="https://models.interlis.ch/models"/>
<MODEL NAME="LocalisationCH_V1" VERSION="2011-08-30" URI="http://www.geo.admin.ch"/>
<MODEL NAME="CHAdminCodes_V1" VERSION="2018-02-19" URI="http://models.geo.admin.ch"/>
<MODEL NAME="GeometryCHLV03_V1" VERSION="2015-11-12" URI="http://www.geo.admin.ch"/>
Expand Down
2 changes: 1 addition & 1 deletion ...ilityhub/referencedata/opengisch_PlanerischerGewaesserschutz_Codetexte_V1_1_duplicate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ File PlanerischerGewaesserschutz_Codetexte_V1_1.xml, VERSION="2019-07-17" (https
<HEADERSECTION SENDER="BAFU" VERSION="2.3">
<MODELS>
<MODEL NAME="Units" VERSION="2012-02-20" URI="http://www.interlis.ch/models"/>
<MODEL NAME="CoordSys" VERSION="2015-11-24" URI="http://models.interlis.ch/models"/>
<MODEL NAME="CoordSys" VERSION="2015-11-24" URI="https://models.interlis.ch/models"/>
<MODEL NAME="LocalisationCH_V1" VERSION="2011-08-30" URI="http://www.geo.admin.ch"/>
<MODEL NAME="CHAdminCodes_V1" VERSION="2018-02-19" URI="http://models.geo.admin.ch"/>
<MODEL NAME="GeometryCHLV03_V1" VERSION="2015-11-12" URI="http://www.geo.admin.ch"/>
Expand Down