Skip to content

Commit 57ba70a

Browse files
rebertrebert
authored
Merge pull request #617 from geoadmin/develop
New Release v2.3.0 - #minor
2 parents 18a7d8a + c926da6 commit 57ba70a

2 files changed

Lines changed: 257 additions & 1 deletion

File tree

‎app/stac_api/migrations/0069_alter_asset_media_type_and_more.py‎

Lines changed: 254 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,254 @@
1+
# Generated by Django 5.2.7 on 2025-11-17 15:24
2+
3+
from django.db import migrations
4+
from django.db import models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('stac_api', '0068_alter_asset_media_type_and_more'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='asset',
16+
name='media_type',
17+
field=models.CharField(
18+
choices=
19+
[(
20+
'application/vnd.apache.parquet',
21+
'Apache Parquet column-oriented data file format (application/vnd.apache.parquet)'
22+
),
23+
(
24+
'application/x.ascii-grid+zip',
25+
'Zipped ESRI ASCII raster format (.asc) (application/x.ascii-grid+zip)'
26+
),
27+
('application/x.ascii-xyz+zip', 'Zipped XYZ (.xyz) (application/x.ascii-xyz+zip)'),
28+
('application/x.e00+zip', 'Zipped e00 (application/x.e00+zip)'),
29+
('application/x.geotiff+zip', 'Zipped GeoTIFF (application/x.geotiff+zip)'),
30+
('image/tiff; application=geotiff', 'GeoTIFF (image/tiff; application=geotiff)'),
31+
('application/x.tiff+zip', 'Zipped TIFF (application/x.tiff+zip)'),
32+
('application/x.png+zip', 'Zipped PNG (application/x.png+zip)'),
33+
('application/x.jpeg+zip', 'Zipped JPEG (application/x.jpeg+zip)'),
34+
(
35+
'application/vnd.google-earth.kml+xml',
36+
'KML (application/vnd.google-earth.kml+xml)'
37+
),
38+
(
39+
'application/vnd.google-earth.kmz',
40+
'Zipped KML (application/vnd.google-earth.kmz)'
41+
), ('application/x.dxf+zip', 'Zipped DXF (application/x.dxf+zip)'),
42+
('application/gml+xml', 'GML (application/gml+xml)'),
43+
('application/x.gml+zip', 'Zipped GML (application/x.gml+zip)'),
44+
('application/vnd.las', 'LIDAR (application/vnd.las)'),
45+
('application/vnd.laszip', 'Zipped LIDAR (application/vnd.laszip)'),
46+
('application/x.vnd.las+zip', 'Zipped LAS (application/x.vnd.las+zip)'),
47+
(
48+
'application/vnd.laszip+copc',
49+
'Cloud Optimized Point Cloud (COPC) (application/vnd.laszip+copc)'
50+
),
51+
('application/x.shapefile+zip',
52+
'Zipped Shapefile (application/x.shapefile+zip)'), (
53+
'application/x.filegdb+zip',
54+
'Zipped File Geodatabase (application/x.filegdb+zip)'
55+
),
56+
(
57+
'application/x.filegdbp+zip',
58+
'Zipped File Geodatabase (ArcGIS Pro) (application/x.filegdbp+zip)'
59+
),
60+
(
61+
'application/x.ms-access+zip',
62+
'Zipped Personal Geodatabase (application/x.ms-access+zip)'
63+
), ('application/x.ms-excel+zip', 'Zipped Excel (application/x.ms-excel+zip)'),
64+
('application/x.tab+zip', 'Zipped Mapinfo-TAB (application/x.tab+zip)'),
65+
(
66+
'application/x.tab-raster+zip',
67+
'Zipped Mapinfo-Raster-TAB (application/x.tab-raster+zip)'
68+
), ('application/x.csv+zip',
69+
'Zipped CSV (application/x.csv+zip)'), ('text/csv', 'CSV (text/csv)'),
70+
('application/geopackage+sqlite3',
71+
'Geopackage (application/geopackage+sqlite3)'), (
72+
'application/x.geopackage+zip',
73+
'Zipped Geopackage (application/x.geopackage+zip)'
74+
), ('application/geo+json', 'GeoJSON (application/geo+json)'),
75+
('application/x.geojson+zip', 'Zipped GeoJSON (application/x.geojson+zip)'),
76+
(
77+
'application/x.interlis; version=2.3',
78+
'Interlis 2 (application/x.interlis; version=2.3)'
79+
),
80+
(
81+
'application/x.interlis+zip; version=2.3',
82+
'Zipped XTF (2.3) (application/x.interlis+zip; version=2.3)'
83+
),
84+
(
85+
'application/x.interlis; version=2.4',
86+
'Interlis 2 (application/x.interlis; version=2.4)'
87+
),
88+
(
89+
'application/x.interlis+zip; version=2.4',
90+
'Zipped XTF (2.4) (application/x.interlis+zip; version=2.4)'
91+
),
92+
(
93+
'application/x.interlis; version=1',
94+
'Interlis 1 (application/x.interlis; version=1)'
95+
),
96+
(
97+
'application/x.interlis+zip; version=1',
98+
'Zipped ITF (application/x.interlis+zip; version=1)'
99+
),
100+
(
101+
'image/tiff; application=geotiff; profile=cloud-optimized',
102+
'Cloud Optimized GeoTIFF (COG) (image/tiff; application=geotiff; profile=cloud-optimized)'
103+
), ('application/pdf', 'PDF (application/pdf)'),
104+
('application/x.pdf+zip', 'Zipped PDF (application/x.pdf+zip)'),
105+
('application/json', 'JSON (application/json)'),
106+
('application/x.json+zip', 'Zipped JSON (application/x.json+zip)'),
107+
('application/x-netcdf', 'NetCDF (application/x-netcdf)'),
108+
('application/x.netcdf+zip', 'Zipped NetCDF (application/x.netcdf+zip)'),
109+
('application/xml', 'XML (application/xml)'),
110+
('application/x.xml+zip', 'Zipped XML (application/x.xml+zip)'),
111+
(
112+
'application/vnd.mapbox-vector-tile',
113+
'mbtiles (application/vnd.mapbox-vector-tile)'
114+
), ('text/plain',
115+
'Text (text/plain)'), ('text/x.plain+zip', 'Zipped text (text/x.plain+zip)'),
116+
('application/x.dwg+zip', 'Zipped DWG (application/x.dwg+zip)'),
117+
('application/zip',
118+
'Generic Zip File (application/zip)'), ('image/tiff', 'TIFF (image/tiff)'),
119+
('image/jpeg', 'JPEG (image/jpeg)'), ('image/png', 'PNG (image/png)'),
120+
('application/vnd.sqlite3', 'sqlite (application/vnd.sqlite3)'),
121+
('application/grib', 'GRIB/GRIB2 (application/grib)'),
122+
('application/x-hdf5',
123+
'HDF5 (application/x-hdf5)'), ('application/x.aixm', 'AIXM (application/x.aixm)'),
124+
('application/x.aixm+zip', 'Zipped AIXM (application/x.aixm+zip)')],
125+
help_text=
126+
"This media type will be used as <em>Content-Type</em> header for the asset's object upon upload.",
127+
max_length=200
128+
),
129+
),
130+
migrations.AlterField(
131+
model_name='collectionasset',
132+
name='media_type',
133+
field=models.CharField(
134+
choices=[
135+
(
136+
'application/vnd.apache.parquet',
137+
'Apache Parquet column-oriented data file format (application/vnd.apache.parquet)'
138+
),
139+
(
140+
'application/x.ascii-grid+zip',
141+
'Zipped ESRI ASCII raster format (.asc) (application/x.ascii-grid+zip)'
142+
),
143+
(
144+
'application/x.ascii-xyz+zip',
145+
'Zipped XYZ (.xyz) (application/x.ascii-xyz+zip)'
146+
), ('application/x.e00+zip', 'Zipped e00 (application/x.e00+zip)'),
147+
('application/x.geotiff+zip', 'Zipped GeoTIFF (application/x.geotiff+zip)'), (
148+
'image/tiff; application=geotiff',
149+
'GeoTIFF (image/tiff; application=geotiff)'
150+
), ('application/x.tiff+zip', 'Zipped TIFF (application/x.tiff+zip)'),
151+
('application/x.png+zip', 'Zipped PNG (application/x.png+zip)'),
152+
('application/x.jpeg+zip', 'Zipped JPEG (application/x.jpeg+zip)'),
153+
(
154+
'application/vnd.google-earth.kml+xml',
155+
'KML (application/vnd.google-earth.kml+xml)'
156+
),
157+
(
158+
'application/vnd.google-earth.kmz',
159+
'Zipped KML (application/vnd.google-earth.kmz)'
160+
), ('application/x.dxf+zip', 'Zipped DXF (application/x.dxf+zip)'),
161+
('application/gml+xml', 'GML (application/gml+xml)'),
162+
('application/x.gml+zip', 'Zipped GML (application/x.gml+zip)'),
163+
('application/vnd.las', 'LIDAR (application/vnd.las)'),
164+
('application/vnd.laszip', 'Zipped LIDAR (application/vnd.laszip)'),
165+
('application/x.vnd.las+zip', 'Zipped LAS (application/x.vnd.las+zip)'),
166+
(
167+
'application/vnd.laszip+copc',
168+
'Cloud Optimized Point Cloud (COPC) (application/vnd.laszip+copc)'
169+
), (
170+
'application/x.shapefile+zip',
171+
'Zipped Shapefile (application/x.shapefile+zip)'
172+
),
173+
(
174+
'application/x.filegdb+zip',
175+
'Zipped File Geodatabase (application/x.filegdb+zip)'
176+
),
177+
(
178+
'application/x.filegdbp+zip',
179+
'Zipped File Geodatabase (ArcGIS Pro) (application/x.filegdbp+zip)'
180+
),
181+
(
182+
'application/x.ms-access+zip',
183+
'Zipped Personal Geodatabase (application/x.ms-access+zip)'
184+
), ('application/x.ms-excel+zip', 'Zipped Excel (application/x.ms-excel+zip)'),
185+
('application/x.tab+zip', 'Zipped Mapinfo-TAB (application/x.tab+zip)'),
186+
(
187+
'application/x.tab-raster+zip',
188+
'Zipped Mapinfo-Raster-TAB (application/x.tab-raster+zip)'
189+
), ('application/x.csv+zip',
190+
'Zipped CSV (application/x.csv+zip)'), ('text/csv', 'CSV (text/csv)'), (
191+
'application/geopackage+sqlite3',
192+
'Geopackage (application/geopackage+sqlite3)'
193+
),
194+
(
195+
'application/x.geopackage+zip',
196+
'Zipped Geopackage (application/x.geopackage+zip)'
197+
), ('application/geo+json', 'GeoJSON (application/geo+json)'),
198+
('application/x.geojson+zip', 'Zipped GeoJSON (application/x.geojson+zip)'),
199+
(
200+
'application/x.interlis; version=2.3',
201+
'Interlis 2 (application/x.interlis; version=2.3)'
202+
),
203+
(
204+
'application/x.interlis+zip; version=2.3',
205+
'Zipped XTF (2.3) (application/x.interlis+zip; version=2.3)'
206+
),
207+
(
208+
'application/x.interlis; version=2.4',
209+
'Interlis 2 (application/x.interlis; version=2.4)'
210+
),
211+
(
212+
'application/x.interlis+zip; version=2.4',
213+
'Zipped XTF (2.4) (application/x.interlis+zip; version=2.4)'
214+
),
215+
(
216+
'application/x.interlis; version=1',
217+
'Interlis 1 (application/x.interlis; version=1)'
218+
),
219+
(
220+
'application/x.interlis+zip; version=1',
221+
'Zipped ITF (application/x.interlis+zip; version=1)'
222+
),
223+
(
224+
'image/tiff; application=geotiff; profile=cloud-optimized',
225+
'Cloud Optimized GeoTIFF (COG) (image/tiff; application=geotiff; profile=cloud-optimized)'
226+
), ('application/pdf', 'PDF (application/pdf)'),
227+
('application/x.pdf+zip', 'Zipped PDF (application/x.pdf+zip)'),
228+
('application/json', 'JSON (application/json)'),
229+
('application/x.json+zip', 'Zipped JSON (application/x.json+zip)'),
230+
('application/x-netcdf', 'NetCDF (application/x-netcdf)'),
231+
('application/x.netcdf+zip', 'Zipped NetCDF (application/x.netcdf+zip)'),
232+
('application/xml', 'XML (application/xml)'),
233+
('application/x.xml+zip', 'Zipped XML (application/x.xml+zip)'),
234+
(
235+
'application/vnd.mapbox-vector-tile',
236+
'mbtiles (application/vnd.mapbox-vector-tile)'
237+
), ('text/plain', 'Text (text/plain)'),
238+
('text/x.plain+zip', 'Zipped text (text/x.plain+zip)'),
239+
('application/x.dwg+zip', 'Zipped DWG (application/x.dwg+zip)'),
240+
('application/zip',
241+
'Generic Zip File (application/zip)'), ('image/tiff', 'TIFF (image/tiff)'),
242+
('image/jpeg', 'JPEG (image/jpeg)'), ('image/png', 'PNG (image/png)'),
243+
('application/vnd.sqlite3', 'sqlite (application/vnd.sqlite3)'),
244+
('application/grib', 'GRIB/GRIB2 (application/grib)'),
245+
('application/x-hdf5', 'HDF5 (application/x-hdf5)'),
246+
('application/x.aixm', 'AIXM (application/x.aixm)'),
247+
('application/x.aixm+zip', 'Zipped AIXM (application/x.aixm+zip)')
248+
],
249+
help_text=
250+
"This media type will be used as <em>Content-Type</em> header for the asset's object upon upload.",
251+
max_length=200
252+
),
253+
),
254+
]

‎app/stac_api/validators.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@
105105
MediaType('image/png', 'PNG', ['.png']),
106106
MediaType('application/vnd.sqlite3', 'sqlite', ['.sqlite']),
107107
MediaType('application/grib', 'GRIB/GRIB2', ['.grib', '.grib2']),
108-
MediaType('application/x-hdf5', 'HDF5', ['.h5'])
108+
MediaType('application/x-hdf5', 'HDF5', ['.h5']),
109+
MediaType('application/x.aixm', 'AIXM', ['.aixm']),
110+
MediaType('application/x.aixm+zip', 'Zipped AIXM', ['.zip'])
109111
]
110112

111113
MT_VAR = "[0-9A-Za-z!#$%&'*+.^_`|~-]+"

0 commit comments

Comments
 (0)