Skip to content

Commit 7bfa0cc

Browse files
JustAProjectaccJustAProjectacc
authored
display temporal extent for OACov and OAFeat collections issue-409 (#446)
1 parent 491a32d commit 7bfa0cc

File tree

5 files changed

+161
-42
lines changed

5 files changed

+161
-42
lines changed

‎deploy/default/msc-pygeoapi-config.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,9 @@ resources:
900900
spatial:
901901
bbox: [-142, 42, -52, 84]
902902
crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84
903+
temporal:
904+
begin: &ahccd_start 1840-01-01T00:00:00Z
905+
end: &ahccd_end 2020-12-31T23:59:59.999999Z
903906
providers:
904907
- type: feature
905908
default: true
@@ -937,8 +940,8 @@ resources:
937940
bbox: [-142, 42, -52, 84]
938941
crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84
939942
temporal:
940-
begin: 1840-01-01T00:00:00Z
941-
end: 2020-12-31T23:59:59.999999Z
943+
begin: *ahccd_start
944+
end: *ahccd_end
942945
providers:
943946
- type: feature
944947
default: true
@@ -1004,8 +1007,8 @@ resources:
10041007
bbox: [-142, 42, -52, 84]
10051008
crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84
10061009
temporal:
1007-
begin: 1840-01-01T00:00:00Z
1008-
end: 2020-12-31T23:59:59.999999Z
1010+
begin: *ahccd_start
1011+
end: *ahccd_end
10091012
providers:
10101013
- type: feature
10111014
default: true
@@ -1071,8 +1074,8 @@ resources:
10711074
bbox: [-142, 42, -52, 84]
10721075
crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84
10731076
temporal:
1074-
begin: 1840-01-01T00:00:00Z
1075-
end: 2020-12-31T23:59:59.999999Z
1077+
begin: *ahccd_start
1078+
end: *ahccd_end
10761079
providers:
10771080
- type: feature
10781081
default: true
@@ -1138,8 +1141,8 @@ resources:
11381141
bbox: [-142, 42, -52, 84]
11391142
crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84
11401143
temporal:
1141-
begin: 1840-01-01T00:00:00Z
1142-
end: 2020-12-31T23:59:59.999999Z
1144+
begin: *ahccd_start
1145+
end: *ahccd_end
11431146
providers:
11441147
- type: feature
11451148
default: true

‎locale/fr/LC_MESSAGES/messages.mo‎

-769 Bytes
Binary file not shown.

‎locale/fr/LC_MESSAGES/messages.po‎

Lines changed: 69 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PROJECT VERSION\n"
99
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
10-
"POT-Creation-Date: 2025-01-10 18:46+0000\n"
10+
"POT-Creation-Date: 2025-10-16 21:01+0000\n"
1111
"PO-Revision-Date: 2022-07-05 09:20-0700\n"
1212
"Last-Translator: \n"
1313
"Language: fr_CA\n"
1414
"Language-Team: \n"
15-
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
15+
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=utf-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
19-
"Generated-By: Babel 2.16.0\n"
19+
"Generated-By: Babel 2.8.0\n"
2020

2121
#: theme/templates/_base.html:46
2222
msgid "Skip to main content"
@@ -379,7 +379,7 @@ msgstr "ID"
379379

380380
#: theme/templates/collections/collection.html:94
381381
#: theme/templates/collections/index.html:23
382-
#: theme/templates/collections/index.html:79
382+
#: theme/templates/collections/index.html:110
383383
#: theme/templates/collections/schema.html:19
384384
#: theme/templates/collections/tiles/index.html:109
385385
#: theme/templates/processes/index.html:14 theme/templates/stac/catalog.html:29
@@ -393,26 +393,65 @@ msgstr "Nom"
393393
msgid "Units"
394394
msgstr "Unités"
395395

396-
#: theme/templates/collections/collection.html:107
396+
#: theme/templates/collections/collection.html:106
397+
#: theme/templates/collections/index.html:31
398+
#: theme/templates/collections/index.html:122
399+
msgid "Temporal range"
400+
msgstr "Étendue temporelle"
401+
402+
#: theme/templates/collections/collection.html:112
403+
#: theme/templates/collections/collection.html:114
404+
#: theme/templates/collections/collection.html:132
405+
#: theme/templates/collections/index.html:45
406+
#: theme/templates/collections/index.html:67
407+
#: theme/templates/collections/index.html:69
408+
#: theme/templates/collections/index.html:79
409+
msgid "From:"
410+
msgstr "De :"
411+
412+
#: theme/templates/collections/collection.html:112
413+
#: theme/templates/collections/collection.html:121
414+
#: theme/templates/collections/collection.html:132
415+
#: theme/templates/collections/collection.html:137
416+
#: theme/templates/collections/index.html:67
417+
#: theme/templates/collections/index.html:72
418+
#: theme/templates/collections/index.html:79
419+
#: theme/templates/collections/index.html:80
420+
#: theme/templates/collections/index.html:132
421+
#: theme/templates/collections/index.html:135
422+
msgid "Not available"
423+
msgstr "Pas disponible"
424+
425+
#: theme/templates/collections/collection.html:121
426+
#: theme/templates/collections/collection.html:123
427+
#: theme/templates/collections/collection.html:137
428+
#: theme/templates/collections/index.html:46
429+
#: theme/templates/collections/index.html:72
430+
#: theme/templates/collections/index.html:74
431+
#: theme/templates/collections/index.html:80
432+
msgid "To:"
433+
msgstr "À :"
434+
435+
#: theme/templates/collections/collection.html:142
397436
#: theme/templates/collections/edr/instance.html:25
398437
#: theme/templates/jobs/job.html:49 theme/templates/processes/process.html:77
399438
#: theme/templates/stac/catalog.html:13
400439
msgid "Links"
401440
msgstr "Liens"
402441

403-
#: theme/templates/collections/collection.html:118
442+
#: theme/templates/collections/collection.html:153
404443
msgid "Reference Systems"
405444
msgstr "Systèmes de référence"
406445

407-
#: theme/templates/collections/collection.html:126
446+
#: theme/templates/collections/collection.html:161
408447
msgid "Storage CRS"
409448
msgstr "Stockage SRC"
410449

411-
#: theme/templates/collections/collection.html:129
450+
#: theme/templates/collections/collection.html:164
412451
msgid "CRS"
413452
msgstr "SRC"
414453

415-
#: theme/templates/collections/collection.html:132
454+
#: theme/templates/collections/collection.html:167
416455
msgid "Epoch"
417456
msgstr "Époque"
418457

@@ -421,20 +460,24 @@ msgid "Collections in this service"
421460
msgstr "Collections dans ce service"
422461

423462
#: theme/templates/collections/index.html:29
424-
#: theme/templates/collections/index.html:83
463+
#: theme/templates/collections/index.html:114
425464
#: theme/templates/collections/schema.html:21
426465
msgid "Type"
427466
msgstr "Type"
428467

429468
#: theme/templates/collections/index.html:30
430-
#: theme/templates/collections/index.html:87
469+
#: theme/templates/collections/index.html:118
431470
#: theme/templates/processes/index.html:15
432471
#: theme/templates/processes/process.html:25
433472
#: theme/templates/processes/process.html:55
434473
#: theme/templates/stac/collection.html:18
435474
msgid "Description"
436475
msgstr "Description"
437476

477+
#: theme/templates/collections/index.html:57
478+
msgid "spatiotemporal"
479+
msgstr "spatio-temporelle"
480+
438481
#: theme/templates/collections/schema.html:20
439482
#: theme/templates/processes/process.html:23
440483
#: theme/templates/processes/process.html:54
@@ -585,67 +628,67 @@ msgstr ""
585628
msgid "Search by keywords"
586629
msgstr "Recherche par mots-clés"
587630

588-
#: theme/templates/collections/items/index.html:99
631+
#: theme/templates/collections/items/index.html:102
589632
msgid "Keyword search for: [% th.key %]"
590633
msgstr "Recherche de mots-clés pour : [% th.key %]"
591634

592-
#: theme/templates/collections/items/index.html:103
635+
#: theme/templates/collections/items/index.html:106
593636
msgid ""
594637
"eg. "BC QC ON" will search for "BC" or "ON""
595638
" or "QC""
596639
msgstr "Par exemple, « BC QC ON » recherchera « BC » ou « ON » ou « QC »"
597640

598-
#: theme/templates/collections/items/index.html:105
641+
#: theme/templates/collections/items/index.html:108
599642
msgid "Keyword"
600643
msgstr "Mot clé"
601644

602-
#: theme/templates/collections/items/index.html:144
645+
#: theme/templates/collections/items/index.html:147
603646
msgid "Limit:"
604647
msgstr "Limite :"
605648

606-
#: theme/templates/collections/items/index.html:154
649+
#: theme/templates/collections/items/index.html:157
607650
msgid "Higher limits are not recommended"
608651
msgstr "Des limites plus élevées ne sont pas recommandées"
609652

610-
#: theme/templates/collections/items/index.html:165
653+
#: theme/templates/collections/items/index.html:168
611654
msgid "Previous"
612655
msgstr "Précédent"
613656

614-
#: theme/templates/collections/items/index.html:167
657+
#: theme/templates/collections/items/index.html:170
615658
#, python-format
616659
msgid "Page [% currentPage %] / [% maxPages %]"
617660
msgstr "Page [% currentPage %] / [% maxPages %]"
618661

619-
#: theme/templates/collections/items/index.html:169
662+
#: theme/templates/collections/items/index.html:172
620663
#: theme/templates/collections/items/item.html:62
621664
msgid "Next"
622665
msgstr "Suivant"
623666

624-
#: theme/templates/collections/items/index.html:197
667+
#: theme/templates/collections/items/index.html:200
625668
msgid ""
626669
"Clear column keyword search queries and reset to display the default "
627670
"results"
628671
msgstr ""
629672
"Effacer les requêtes de recherche par mots-clés des colonnes et "
630673
"réinitialiser pour afficher les résultats par défaut"
631674

632-
#: theme/templates/collections/items/index.html:202
675+
#: theme/templates/collections/items/index.html:205
633676
msgid "Showing $firstPage to $upper of $itemsTotal"
634677
msgstr "Affichage de $firstPage jusqu'à $upper de $itemsTotal"
635678

636-
#: theme/templates/collections/items/index.html:203
679+
#: theme/templates/collections/items/index.html:206
637680
msgid "Showing 0 results"
638681
msgstr "Affichage de 0 résultats"
639682

640-
#: theme/templates/collections/items/index.html:247
683+
#: theme/templates/collections/items/index.html:250
641684
msgid "filtered from $totalSize total entry"
642685
msgstr "filtré de $totalSize entrée au total"
643686

644-
#: theme/templates/collections/items/index.html:248
687+
#: theme/templates/collections/items/index.html:251
645688
msgid "filtered from $totalSize total entries"
646689
msgstr "filtrées de $totalSize entrées au total"
647690

648-
#: theme/templates/collections/items/index.html:249
691+
#: theme/templates/collections/items/index.html:252
649692
msgid "Showing $startEntryOfPage to $lastEntryOfPage of $filteredNumEntries"
650693
msgstr ""
651694
"Affichage de $startEntryOfPage jusqu'à $lastEntryOfPage de "
@@ -902,10 +945,6 @@ msgstr "URL"
902945
msgid "Map extent preview not available"
903946
msgstr "Aperçu de l'étendue de la carte n'est pas disponible"
904947

905-
#: theme/templates/collections/index.html:51
906-
msgid "spatiotemporal"
907-
msgstr "spatio-temporelle"
908-
909948
#~ msgid ""
910949
#~ "No results. Please modify your search query or <button\n"
911950
#~ " :title=\"txt.reset\" \n"
@@ -923,3 +962,4 @@ msgstr "spatio-temporelle"
923962

924963
#~ msgid "Output Formats"
925964
#~ msgstr "Formats de fichiers"
965+

‎theme/templates/collections/collection.html‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,42 @@ <h3>{% trans %}Parameters{% endtrans %}</h3>
103103
{% endfor %}
104104
</table>
105105
{% endif %}
106-
106+
<h3>{% trans %}Temporal range{% endtrans %}</h3>
107+
{% if data['extent']['temporal'] != undefined %}
108+
<ul>
109+
<li>
110+
<div>
111+
{% if data['extent']['temporal']['interval'][0][0] == None %}
112+
{% trans %}From:{% endtrans %} {% trans %}Not available{% endtrans %}
113+
{% else %}
114+
{% trans %}From:{% endtrans %} {{data['extent']['temporal']['interval'][0][0]}}
115+
{% endif %}
116+
</div>
117+
</li>
118+
<li>
119+
<div>
120+
{% if data['extent']['temporal']['interval'][0][1] == None %}
121+
{% trans %}To:{% endtrans %} {% trans %}Not available{% endtrans %}
122+
{% else %}
123+
{% trans %}To:{% endtrans %} {{data['extent']['temporal']['interval'][0][1]}}
124+
{% endif %}
125+
</div>
126+
</li>
127+
</ul>
128+
{% else %}
129+
<ul>
130+
<li>
131+
<div>
132+
{% trans %}From:{% endtrans %} {% trans %}Not available{% endtrans %}
133+
</div>
134+
</li>
135+
<li>
136+
<div>
137+
{% trans %}To:{% endtrans %} {% trans %}Not available{% endtrans %}
138+
</div>
139+
</li>
140+
</ul>
141+
{% endif %}
107142
<h3>{% trans %}Links{% endtrans %}</h3>
108143
<ul>
109144
{% for link in data['links'] %}

0 commit comments

Comments
 (0)