Skip to content

Commit

Permalink
Merge pull request #43 from Dewberry/feature/import-ready
Browse files Browse the repository at this point in the history
  • Loading branch information
ar-siddiqui authored Jun 19, 2023
2 parents dce2be0 + 66ea029 commit 59171c2
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 15 deletions.
4 changes: 2 additions & 2 deletions handlers/forcingdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"path/filepath"
"sync"

"app/config"
"app/tools"
"github.com/Dewberry/mcat-ras/config"
"github.com/Dewberry/mcat-ras/tools"

"github.com/USACE/filestore"
"github.com/go-errors/errors" // warning: replaces standard errors
Expand Down
4 changes: 2 additions & 2 deletions handlers/geospatialdata.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"path/filepath"
"strings"

"app/config"
"app/tools"
"github.com/Dewberry/mcat-ras/config"
"github.com/Dewberry/mcat-ras/tools"

"github.com/USACE/filestore"
"github.com/dewberry/gdal"
Expand Down
2 changes: 1 addition & 1 deletion handlers/index.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"net/http"

ras "app/tools"
ras "github.com/Dewberry/mcat-ras/tools"

"github.com/USACE/filestore"
"github.com/go-errors/errors" // warning: replaces standard errors
Expand Down
2 changes: 1 addition & 1 deletion handlers/isamodel.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"path/filepath"
"strings"

"app/tools"
"github.com/Dewberry/mcat-ras/tools"

"github.com/USACE/filestore"
"github.com/labstack/echo/v4"
Expand Down
3 changes: 2 additions & 1 deletion handlers/modelversion.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package handlers

import (
"app/tools"
"bufio"
"fmt"
"net/http"
"path/filepath"
"regexp"
"strings"

"github.com/Dewberry/mcat-ras/tools"

"github.com/USACE/filestore" // warning: replaces standard errors
"github.com/labstack/echo/v4"
)
Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package main

import (
"app/config"
"app/handlers"
"app/pgdb"
"github.com/Dewberry/mcat-ras/config"
"github.com/Dewberry/mcat-ras/handlers"
"github.com/Dewberry/mcat-ras/pgdb"

"github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware"
Expand Down
7 changes: 4 additions & 3 deletions pgdb/handler.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package pgdb

import (
"app/config"
"app/handlers"
"fmt"
"net/http"

"github.com/Dewberry/mcat-ras/config"
"github.com/Dewberry/mcat-ras/handlers"

"github.com/go-errors/errors" // warning: replaces standard errors
"github.com/jmoiron/sqlx"
"github.com/labstack/echo/v4"
Expand Down Expand Up @@ -41,7 +42,7 @@ func UpsertRasGeometry(ac *config.APIConfig, db *sqlx.DB) echo.HandlerFunc {
if definitionFile == "" {
return c.JSON(http.StatusBadRequest,
handlers.SimpleResponse{Status: http.StatusBadRequest,
Message: "Missing query parameter: `definition_file`", })
Message: "Missing query parameter: `definition_file`"})
}

err := upsertModelGeometry(definitionFile, ac, db)
Expand Down
5 changes: 3 additions & 2 deletions pgdb/tools.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package pgdb

import (
"app/config"
ras "app/tools"
"context"
"database/sql"
"encoding/json"
Expand All @@ -12,6 +10,9 @@ import (
"strconv"
"strings"

"github.com/Dewberry/mcat-ras/config"
ras "github.com/Dewberry/mcat-ras/tools"

"github.com/go-errors/errors" // warning: replaces standard errors
"github.com/jmoiron/sqlx"
)
Expand Down

0 comments on commit 59171c2

Please sign in to comment.