Skip to content
Snippets Groups Projects
Commit 1aee660c authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Merge branch 'feature/gridv-6-mapserver-layer' into 'develop'

feat: Add test page (spatial) with mapserver layer in openlayers map

See merge request !12
parents c69fcc1b e2b20da8
No related branches found
No related tags found
1 merge request!12feat: Add test page (spatial) with mapserver layer in openlayers map
Showing with 2209 additions and 2 deletions
...@@ -17,3 +17,4 @@ VIPSWeb/static/test/aggregate.kml~ ...@@ -17,3 +17,4 @@ VIPSWeb/static/test/aggregate.kml~
VIPSWeb/static/test/dot_green.png VIPSWeb/static/test/dot_green.png
VIPSWeb/static/test/oatFloweringModelForm.html VIPSWeb/static/test/oatFloweringModelForm.html
VIPSWeb.code-workspace VIPSWeb.code-workspace
venv
\ No newline at end of file
...@@ -143,11 +143,13 @@ INSTALLED_APPS = ( ...@@ -143,11 +143,13 @@ INSTALLED_APPS = (
'observations', 'observations',
'information', 'information',
'cerealblotchmodels', 'cerealblotchmodels',
'ipmd',
'calculators', 'calculators',
'roughage', 'roughage',
'applefruitmoth', 'applefruitmoth',
'fusarium', 'fusarium',
'security', 'security',
'spatial',
'mock', 'mock',
'VIPSWeb' 'VIPSWeb'
) )
......
...@@ -130,7 +130,14 @@ a.signinLink, a.signinLink:visited { ...@@ -130,7 +130,14 @@ a.signinLink, a.signinLink:visited {
} }
.featureInfo {
display: none;
position: absolute;
background-color: white;
border: 1px solid black;
padding: 5px;
transition: opacity 0.5s ease-out;
}
a.dropdown-toggle{ a.dropdown-toggle{
height: 65px; height: 65px;
......
This diff is collapsed.
...@@ -49,7 +49,8 @@ else: ...@@ -49,7 +49,8 @@ else:
# Uncomment the admin/doc line below to enable admin documentation: # Uncomment the admin/doc line below to enable admin documentation:
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
re_path(r'^spatial/', include('spatial.urls')),
re_path(r'^cydiapomonella/', include('cydiapomonella.urls')), re_path(r'^cydiapomonella/', include('cydiapomonella.urls')),
re_path(r'^forecasts/', include('forecasts.urls', namespace = "forecasts")), re_path(r'^forecasts/', include('forecasts.urls', namespace = "forecasts")),
re_path(r'^messages/', include('vips_messages.urls', namespace = "vips_messages")), re_path(r'^messages/', include('vips_messages.urls', namespace = "vips_messages")),
...@@ -57,6 +58,7 @@ else: ...@@ -57,6 +58,7 @@ else:
re_path(r'^observations/', include('observations.urls', namespace = "observations")), re_path(r'^observations/', include('observations.urls', namespace = "observations")),
re_path(r'^information/', include('information.urls', namespace = "information")), re_path(r'^information/', include('information.urls', namespace = "information")),
re_path(r'^blotch/', include('cerealblotchmodels.urls', namespace = "cerealblotchmodels")), re_path(r'^blotch/', include('cerealblotchmodels.urls', namespace = "cerealblotchmodels")),
re_path(r'^ipmd/', include('ipmd.urls', namespace = "ipmd")),
re_path(r'^calculators/', include('calculators.urls', namespace = "calculators")), re_path(r'^calculators/', include('calculators.urls', namespace = "calculators")),
re_path(r'^roughage/', include('roughage.urls', namespace = "roughage")), re_path(r'^roughage/', include('roughage.urls', namespace = "roughage")),
re_path(r'^security/', include('security.urls', namespace = "security")), re_path(r'^security/', include('security.urls', namespace = "security")),
......
...@@ -29,6 +29,11 @@ pip install -r requirements.txt ...@@ -29,6 +29,11 @@ pip install -r requirements.txt
./manage.py migrate ./manage.py migrate
``` ```
5. Run application
```
python3 manage.py runserver
```
## Running with mod_wsgi ## Running with mod_wsgi
The official Django documentation for this [can be found here](https://docs.djangoproject.com/en/3.1/howto/deployment/wsgi/modwsgi/) The official Django documentation for this [can be found here](https://docs.djangoproject.com/en/3.1/howto/deployment/wsgi/modwsgi/)
...@@ -67,3 +72,5 @@ Each installation of VIPSWeb can be customized in several ways ...@@ -67,3 +72,5 @@ Each installation of VIPSWeb can be customized in several ways
This is done by making a copy of `local_settings_sample.py` to `local_settings.py` and customizing it. `local_settings.py` is ignored by Git. This is done by making a copy of `local_settings_sample.py` to `local_settings.py` and customizing it. `local_settings.py` is ignored by Git.
## Configuration of VIPSLogic
TODO
\ No newline at end of file
from django.contrib import admin
# Register your models here.
from django.apps import AppConfig
class IpmdConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'ipmd'
from django.db import models
# Create your models here.
This diff is collapsed.
{% extends "base.html" %}
{% load static %}
{% comment %}
#
# Copyright (c) 2023 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
# it under the terms of the NIBIO Open Source License as published by
# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# NIBIO Open Source License for more details.
#
# You should have received a copy of the NIBIO Open Source License
# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
{% endcomment %}
{% load i18n %}
{% block title%}{% trans "IPM Decisions models" %}{%endblock%}
{% block content %}
<h1>{% trans "IPM Decisions models" %}</h1>
<ul>
<li><a href="/ipmd/saddlegallmidge">{% trans "Saddle gall midge" %}</a></li>
</ul>
{% endblock %}
\ No newline at end of file
This diff is collapsed.
from django.test import TestCase
# Create your tests here.
#
# Copyright (c) 2023 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
# it under the terms of the NIBIO Open Source License as published by
# NIBIO, either version 1 of the License, or (at your option) any
# later version.
#
# VIPSWeb is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# NIBIO Open Source License for more details.
#
# You should have received a copy of the NIBIO Open Source License
# along with VIPSWeb. If not, see <http://www.nibio.no/licenses/>.
#
from django.urls import re_path
from ipmd import views
app_name = "ipmd"
urlpatterns = [
# ex: /forecasts/
re_path(r'^$', views.index, name='index'),
re_path(r'saddlegallmidge/', views.saddlegallmidgeform, name='saddlegallmidgeform')
]
\ No newline at end of file
from django.shortcuts import render
# Create your views here.
def index(request):
context = {}
return render(request, 'ipmd/index.html', context)
def saddlegallmidgeform(request):
context = {}
return render(request, 'ipmd/saddlegallmidgeform.html', context)
\ No newline at end of file
from django.contrib import admin
# Register your models here.
from django.apps import AppConfig
class SpatialConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'spatial'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment